u-boot-brain/arch
Tom Rini 17dcbfb087 Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
Quick manual fixup to merge the USB boot related defines and TPM related
defines.

Conflicts:
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>
2013-04-18 16:16:01 -04:00
..
arm exynos: Correct use of 64-bit division 2013-04-17 10:00:40 +09:00
avr32 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
blackfin Consolidate bool type 2013-04-01 16:33:52 -04:00
m68k Consolidate bool type 2013-04-01 16:33:52 -04:00
microblaze Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
mips Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
nds32 Consolidate bool type 2013-04-01 16:33:52 -04:00
nios2 Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
openrisc Introduce generic link section.h symbol files 2013-03-15 16:13:58 -04:00
powerpc Merge branch 'master' of git://git.denx.de/u-boot-usb 2013-04-11 14:31:50 -04:00
sandbox Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
sh Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-03-18 14:37:18 -04:00
sparc sparc: Fix build warnings in serial.c 2013-03-15 16:14:02 -04:00
x86 x86: Fix DRAM bank size init with generic board 2013-04-15 16:26:09 -07:00
.gitignore update include/asm/ gitignore after move 2010-05-07 00:17:30 +02:00