git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3482528
413541d
)
Merge 3.13-rc5 into usb-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:18:03 +0000
(10:18 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:18:03 +0000
(10:18 -0800)
This resolves the merge issue with drivers/usb/host/ohci-at91.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Trivial merge