]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit00ce281b85fc29138a64e66ae6fe7fb24841af60
tree61e8c51ed5b9fae163d2d54967ebda02805c0bfa
parent62945b7fecaa8531c0967bb23ebc17e8052b3141
parenta8bdd51f99d9b1667cdf699af3043328c3c16911
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