Albert ARIBAUD a891601ce5 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' ... Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace.		2014-01-06 08:49:58 +01:00
..
cpu	Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'	2014-01-06 08:49:58 +01:00
dts	exynos5: dts: Add device node for XHCI	2013-10-20 23:42:38 +02:00
imx-common	MX6: fix sata compilation for i.MX6	2013-12-19 11:04:33 +01:00
include/asm	Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'	2014-01-06 08:49:58 +01:00
lib	Revert "ARM: move interrupt_init to before relocation"	2013-12-11 21:28:06 +01:00
config.mk	arm: keep all sections in ELF file	2013-12-07 06:53:58 +01:00