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
..
arndale	usb: exynos5: arndale: Add network support	2014-01-13 12:23:28 +01:00
common	board:samsung:common: set envs with board unified information	2014-02-07 10:06:24 +09:00
goni	board:samsung:goni: add env variables describing platform	2014-02-07 10:06:24 +09:00
origen	kbuild: add dummy obj-y to create built-in.o	2014-02-19 11:07:50 -05:00
smdk2410	board: arm: convert makefiles to Kbuild style	2013-11-01 11:42:12 -04:00
smdk5250	Exynos5250: Remove lowlevelinit	2014-02-19 10:44:27 +01:00
smdk5420	Exynos5420: Add base patch for SMDK5420	2013-12-30 16:50:34 +09:00
smdkc100	board: arm: convert makefiles to Kbuild style	2013-11-01 11:42:12 -04:00
smdkv310	kbuild: add dummy obj-y to create built-in.o	2014-02-19 11:07:50 -05:00
trats	board:samsung:trats: add env variables describing platform	2014-02-07 10:06:24 +09:00
trats2	board:samsung:trats2: add env variables describing platform	2014-02-07 10:06:24 +09:00
universal_c210	board:samsung:universal: add env variables describing platform	2014-02-07 10:06:24 +09:00