Albert ARIBAUD 3e11350255 Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Conflicts: Makefile drivers/net/npe/Makefile These two conflicts arise from commit 0b2d3f20 ("ARM: NET: Remove the IXP NPE ethernet driver") and are resolved by deleting the drivers/net/npe/Makefile file and removing the CONFIG_IXP4XX_NPE line from Makefile.		2014-02-20 13:16:05 +01:00
..
cpu	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-02-20 13:16:05 +01:00
dts	dts: generate multiple device tree blobs	2014-02-19 11:10:05 -05:00
imx-common	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-02-20 13:16:05 +01:00
include/asm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-02-20 13:16:05 +01:00
lib	Move #ifdef(CONFIG_DISPLAY_CPUINFO) from caller to callee	2014-02-19 11:10:05 -05:00
config.mk	ARM: merge commonly-defined PLATFORM_RELFLAGS	2014-01-24 16:59:08 -05:00