| commit | 4cd41ffd27b6b775445ecfdb72b592b71d6b4a32 | [log] [tgz] |
|---|---|---|
| author | Felipe Balbi <balbi@ti.com> | Tue Sep 16 09:53:59 2014 -0500 |
| committer | Felipe Balbi <balbi@ti.com> | Tue Sep 16 09:53:59 2014 -0500 |
| tree | 61e8c51ed5b9fae163d2d54967ebda02805c0bfa | |
| parent | d9152161b4bfd131a8253a5b9fcd8ba9b10277c4 [diff] | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be [diff] |
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