From: Greg Kroah-Hartman Date: Thu, 5 Jul 2012 15:57:24 +0000 (-0700) Subject: Merge 3.5-rc5 into usb-next X-Git-Tag: v3.6-rc1~101^2~24^2~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e765bf84d59257d3c4f948fbce426ea3565e83ad;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 --- e765bf84d59257d3c4f948fbce426ea3565e83ad