git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d07f4a8
3fa4d73
)
Merge branch 'nop-phy-rename' into next
author
Felipe Balbi
<balbi@ti.com>
Fri, 9 Aug 2013 14:31:23 +0000
(17:31 +0300)
committer
Felipe Balbi
<balbi@ti.com>
Fri, 9 Aug 2013 14:31:23 +0000
(17:31 +0300)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-generic.c
Trivial merge