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
..
microblaze-generic	microblaze: convert makefiles to Kbuild style	2013-10-31 13:26:45 -04:00
ml507	Makefile: convert makefiles to Kbuild style and delete grep switch	2013-11-01 11:42:13 -04:00
ppc405-generic	Makefile: make directories by Makefile.build	2013-11-17 14:11:31 -05:00
ppc440-generic	Makefile: make directories by Makefile.build	2013-11-17 14:11:31 -05:00
zynq	zynq: Add support for U-BOOT SPL	2014-02-19 09:41:22 +01:00