git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d915216
9e82bf0
)
Merge tag 'v3.17-rc5' into next
author
Felipe Balbi
<balbi@ti.com>
Tue, 16 Sep 2014 14:53:59 +0000
(09:53 -0500)
committer
Felipe Balbi
<balbi@ti.com>
Tue, 16 Sep 2014 14:53:59 +0000
(09:53 -0500)
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
Trivial merge