Merge tag 'v3.17-rc4' into next

Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/function/Makefile
	drivers/usb/gadget/legacy/Makefile
	drivers/usb/phy/phy-samsung-usb.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/dwc3/dwc3-omap.c
Simple merge

diff --cc drivers/usb/gadget/function/uvc_video.c
Simple merge

diff --cc drivers/usb/gadget/udc/Kconfig
Simple merge

diff --cc drivers/usb/gadget/udc/r8a66597-udc.c
Simple merge

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