roy zang 6bd87c0aee Solve the copyright conflicts when merging 'master' into hpc2. ...

Merge branch 'master' into hpc2

Conflicts:

	drivers/cfi_flash.c

2006-11-29 09:45:03 +08:00

..

74xx_7xx

General code modification for mpc7448hpc2 board support.

2006-11-02 18:49:51 +08:00

arm720t

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

arm920t

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

arm925t

[PATCH] omap925.c: Remove unused functions

2006-10-28 17:13:12 +02:00

arm926ejs

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

arm946es

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

arm1136

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

arm_intcm

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

at32ap

Fix "ar" flags in some Makefiles to allow for silent "make -s"

2006-10-27 11:55:21 +02:00

bf533

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

i386

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

ixp

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

lh7a40x

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mcf52x2

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

microblaze

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mips

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mpc5xx

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mpc5xxx

Merge with /home/tur/proj/051_uboot_linux_v38b/u-boot

2006-10-18 22:27:57 +02:00

mpc8xx

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mpc83xx

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mpc85xx

Code cleanup

2006-10-24 15:32:57 +02:00

mpc86xx

MPC86xx: Cleaned up unused and conditionally used local variables.

2006-10-27 17:46:10 +02:00

mpc824x

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mpc8220

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

mpc8260

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

nios

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

nios2

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

ppc4xx

Merge with /home/sr/git/u-boot/denx-alpr-merge-test

2006-11-27 23:11:18 +01:00

pxa

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

s3c44b0

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

sa1100

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00