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
..
arc	arc: add library functions	2014-02-07 08:14:32 -05:00
arm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-02-20 13:16:05 +01:00
avr32	avr32: delete unused header files	2014-01-24 16:59:07 -05:00
blackfin	kbuild: use scripts/Makefile.clean	2014-02-19 11:10:04 -05:00
m68k	kbuild: use Linux Kernel build scripts	2014-02-19 11:07:50 -05:00
microblaze	dts: generate multiple device tree blobs	2014-02-19 11:10:05 -05:00
mips	kbuild: change out-of-tree build	2014-02-19 11:07:50 -05:00
nds32	kbuild: add dummy obj-y to create built-in.o	2014-02-19 11:07:50 -05:00
nios2	nios2: convert makefiles to Kbuild style	2013-11-01 11:42:11 -04:00
openrisc	openrisc: convert makefiles to Kbuild style	2013-10-31 13:26:45 -04:00
powerpc	kbuild: use Linux Kernel build scripts	2014-02-19 11:07:50 -05:00
sandbox	kbuild: use Linux Kernel build scripts	2014-02-19 11:07:50 -05:00
sh	sh: sh2: Remove CONFIG_SH2A definition from asm/processor.h	2014-01-09 13:22:22 +09:00
sparc	kbuild: change out-of-tree build	2014-02-19 11:07:50 -05:00
x86	dts: generate multiple device tree blobs	2014-02-19 11:10:05 -05:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00