Skip to content
Commit e765bf84 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.5-rc5 into usb-next 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents afd6bb38 6887a413
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment