Merge 3.5-rc5 into usb-next

Browse Source

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

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman

2012-07-05 08:57:24 -07:00

parent afd6bb3873 6887a4131d

commit e765bf84d5

257 changed files with 1565 additions and 1062 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

scripts/gfp-translate Normal file → Executable file