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
..
asm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-02-20 13:16:05 +01:00