git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
04aebcb
693d92a
)
Merge branch 2.6.39-rc7 into usb-linus
author
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 10 May 2011 20:30:45 +0000
(13:30 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 10 May 2011 20:30:45 +0000
(13:30 -0700)
This was needed to resolve a conflict in:
drivers/usb/host/isp1760-hcd.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff