Tom Rini fc9b0b8043 Merge branch 'master' of git://git.denx.de/u-boot-usb ... Conflicts: board/freescale/mx6sxsabresd/mx6sxsabresd.c Signed-off-by: Tom Rini <trini@ti.com>		2014-12-11 18:40:49 -05:00
..
cpu	Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq	2014-12-11 18:28:09 -05:00
dts	ARM: UniPhier: add device tree sources for PH1-sLD3	2014-12-09 00:08:26 +09:00
imx-common	sata: fix reset_sata for dwc_ahsata	2014-12-01 10:20:19 +01:00
include	Merge branch 'master' of git://git.denx.de/u-boot-usb	2014-12-11 18:40:49 -05:00
lib	Merge branch 'master' of git://git.denx.de/u-boot-arm	2014-11-24 17:05:11 -05:00
mvebu-common	arm: kirkwood: Change naming of dram functions from km_foo() to mvebu_foo()	2014-10-23 09:59:21 -04:00
config.mk	kconfig: delete redundant CONFIG_${ARCH} definition	2014-07-30 14:42:02 -04:00
Kconfig	Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq	2014-12-11 18:28:09 -05:00
Kconfig.debug	arm: debug: add Kconfig entries for lowlevel debug	2014-10-26 22:23:12 +01:00
Makefile	Kbuild: introduce Makefile in arch/$ARCH/	2014-12-08 09:35:45 -05:00