Albert ARIBAUD 4b19b7448e Merge remote-tracking branch 'u-boot-imx/master' ...

The single file conflict below is actually trivial.

Conflicts:
	board/boundary/nitrogen6x/nitrogen6x.c

2014-10-08 21:20:49 +02:00

..

eth

net: usb: Add SMSC copyright to smsc95xx driver

2014-09-16 12:23:59 -04:00

gadget

cosmetic: replace MIN, MAX with min, max

2014-09-24 18:30:29 -04:00

host

usb: ehci-mx6: Rename the USB register base address

2014-09-29 10:33:27 +02:00

musb

usb: create common header virtual root hub descriptors

2014-03-10 18:53:36 +01:00

musb-new

kbuild: force to define __UBOOT__ in all the C sources

2014-09-16 12:23:56 -04:00

phy

usb: phy: omap_usb_phy: implement usb_phy_power() for AM437x

2014-07-09 22:11:51 +02:00

ulpi

drivers: usb: convert makefiles to Kbuild style

2013-10-31 13:25:38 -04:00

Kconfig

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00