git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c6a389f
55a4626
)
Merge 3.1-rc4 into usb-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 29 Aug 2011 15:56:17 +0000
(08:56 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 29 Aug 2011 15:56:17 +0000
(08:56 -0700)
This was done to resolve a conflict in this file:
drivers/usb/host/xhci-ring.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff