| commit | f7cc38b16e2741186253be3dff61a9d124112126 | [log] [tgz] |
|---|---|---|
| author | Felipe Balbi <balbi@ti.com> | Mon Sep 08 14:39:01 2014 -0500 |
| committer | Felipe Balbi <balbi@ti.com> | Mon Sep 08 14:39:01 2014 -0500 |
| tree | efce170d7c0c4baf6924275e6a42d11fa47c9290 | |
| parent | efb540c895d2cb77b1472edda6ca45d40719a041 [diff] | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd [diff] |
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