Albert ARIBAUD f15ea6e1d6 Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyard Needed manual fix: arch/arm/cpu/armv7/omap-common/Makefile board/compulab/cm_t335/u-boot.lds		2013-12-10 22:23:59 +01:00
..
cpu	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2013-12-10 22:23:59 +01:00
dts	exynos5: dts: Add device node for XHCI	2013-10-20 23:42:38 +02:00
imx-common	ARM: imx-common: convert makefiles to Kbuild style	2013-10-31 13:20:39 -04:00
include/asm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2013-12-10 22:23:59 +01:00
lib	cosmetic: remove empty lines at the top of file	2013-11-08 09:41:37 -05:00
config.mk	arm: keep all sections in ELF file	2013-12-07 06:53:58 +01:00