u-boot-brain/arch/arm
Tom Rini e20cc2ca15 Merge branch 'master' of git://88.191.163.10/u-boot-arm
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>
2013-08-18 14:14:34 -04:00
..
cpu Merge branch 'master' of git://88.191.163.10/u-boot-arm 2013-08-18 14:14:34 -04:00
dts Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
imx-common Merge git://git.denx.de/u-boot-arm 2013-07-31 11:30:38 +02:00
include/asm Merge branch 'master' of git://88.191.163.10/u-boot-arm 2013-08-18 14:14:34 -04:00
lib arm: spl: For Falcon Mode, set a default machid of ~0 2013-08-15 18:38:35 -04:00
config.mk ARM: OMAP: Add CONFIG_OMAP_COMMON 2013-08-15 08:51:10 -04:00