Merge remote-tracking branch 'usb-gadget/next'

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/power/Kconfig
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-mv.c
Simple merge

diff --cc drivers/usb/host/ehci-s5p.c
Simple merge

diff --cc drivers/usb/phy/phy-isp1301-omap.c
Simple merge

diff --cc drivers/usb/phy/phy-mv-u3d-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-twl4030-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-twl6030-usb.c
Simple merge