projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b870def
5611cc4
)
Merge v3.2-rc4 into usb-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Sat, 10 Dec 2011 00:07:37 +0000
(16:07 -0800)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Sat, 10 Dec 2011 00:07:48 +0000
(16:07 -0800)
This lets us handle the PS3 merge easier, as well as syncing up with
other USB fixes already in the -rc4 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge