git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22a416c
fe25092
)
Merge tag 'usb-3.3-rc3' into usb-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 19:12:55 +0000
(11:12 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 19:13:53 +0000
(11:13 -0800)
This is done to resolve a merge conflict with:
drivers/usb/class/cdc-wdm.c
and to better handle future patches for this driver as it is under
active development at the moment.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Trivial merge