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
..
arm	Merge branch 'master' of git://88.191.163.10/u-boot-arm	2013-08-18 14:14:34 -04:00
avr32	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
blackfin	blackfin: Fix using gd->baudrate before setting its value	2013-07-31 16:56:04 +08:00
m68k	Merge branch 'master' of git://git.denx.de/u-boot-i2c	2013-07-24 09:50:24 -04:00
microblaze	microblaze: Call spi_init function	2013-08-08 18:58:11 +05:30
mips	MIPS: bootm: drop obsolete Qemu specific bootm implementation	2013-08-13 11:58:48 +02:00
nds32	nds32: introduce DMA allocation API	2013-08-09 01:51:11 +08:00
nios2	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
openrisc	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
powerpc	powerpc/usb: Depricate usb_phy_type and usb_dr_mode uboot env variables	2013-08-14 10:58:21 -07:00
sandbox	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
sh	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
sparc	Add GPL-2.0+ SPDX-License-Identifier to source files	2013-07-24 09:44:38 -04:00
x86	config: don't define CONFIG_ARCH_DEVICE_TREE	2013-08-02 18:30:11 -04:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00