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
..
eth	drivers: usb: convert makefiles to Kbuild style	2013-10-31 13:25:38 -04:00
gadget	usb: mv_udc: Rename to ci_udc	2014-02-06 04:48:15 +01:00
host	ARM: USB: Remove the IXP EHCI driver	2014-02-06 02:51:52 +01:00
musb	drivers: usb: convert makefiles to Kbuild style	2013-10-31 13:25:38 -04:00
musb-new	kbuild: use Linux Kernel build scripts	2014-02-19 11:07:50 -05:00
phy	drivers: usb: convert makefiles to Kbuild style	2013-10-31 13:25:38 -04:00
ulpi	drivers: usb: convert makefiles to Kbuild style	2013-10-31 13:25:38 -04:00