projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: afd6bb3 6887a41)
Merge 3.5-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Jul 2012 15:57:24 +0000 (08:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Jul 2012 15:58:03 +0000 (08:58 -0700)
commite765bf84d59257d3c4f948fbce426ea3565e83ad
treee6c2fa13b21a2faf398c3c6ceba8fe5187e381d7tree | snapshot
parentafd6bb387323154ff6554b52d333ec6efb8efe61commit | diff
parent6887a4131da3adaab011613776d865f4bcfb5678commit | diff
Merge 3.5-rc5 into usb-next

This resolves a merge issue with the option.c USB serial driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/option.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.