Merge tag 'v3.17-rc5' into next
authorFelipe Balbi <balbi@ti.com>
Tue, 16 Sep 2014 14:53:59 +0000 (09:53 -0500)
committerFelipe Balbi <balbi@ti.com>
Tue, 16 Sep 2014 14:53:59 +0000 (09:53 -0500)
commit4cd41ffd27b6b775445ecfdb72b592b71d6b4a32
tree61e8c51ed5b9fae163d2d54967ebda02805c0bfa
parentd9152161b4bfd131a8253a5b9fcd8ba9b10277c4
parent9e82bf014195d6f0054982c463575cdce24292be
Merge tag 'v3.17-rc5' into next

Linux 3.17-rc5

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Documentation/devicetree/bindings/usb/mxs-phy.txt
MAINTAINERS
drivers/usb/dwc3/core.c
drivers/usb/dwc3/dwc3-omap.c
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/function/f_fs.c
drivers/usb/musb/musb_cppi41.c
drivers/usb/phy/phy-mxs-usb.c