Wolfgang Denk 54e19a7ded Merge branch 'master' into next ... Conflicts: Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>		2010-06-18 01:20:49 +02:00
..
arm	Merge branch 'master' into next	2010-06-18 01:20:49 +02:00
avr32	avr32: Move cpu/at32ap/* to arch/avr32/cpu/*	2010-04-13 09:13:25 +02:00
blackfin	blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*	2010-04-13 09:13:25 +02:00
i386	Coding style cleanup, update CHANGELOG.	2010-05-26 23:51:22 +02:00
m68k	add CONFIG_SYS_FEC_FULL_MII for MCF5445x	2010-05-28 02:15:57 -05:00
microblaze	microblaze: Consolidate cache code	2010-04-16 12:56:33 +02:00
mips	mips: Move cpu/mips/* to arch/mips/cpu/*	2010-04-13 09:13:25 +02:00
nios2	nios2: allow STANDALONE_LOAD_ADDR overriding	2010-05-28 10:56:04 -04:00
powerpc	video: cfb_console: add weak default video_set_lut()	2010-06-14 12:28:28 +02:00
sh	sh: Move cpu/$CPU to arch/sh/cpu/$CPU	2010-04-13 09:13:17 +02:00
sparc	sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]	2010-04-13 09:13:26 +02:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00