projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
This resolves a merge issue with the option.c USB serial driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/serial/option.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/serial/option.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.