Merge 3.5-rc5 into usb-next

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

Greg Kroah-Hartman committed 14 years ago

Commit e765bf82 parents afd6bb3 6887a41257 files · +1564 −1061Browse files

Showing the changes to scripts (1 of 257 files). Show all

Unified · Split

File mode changed from 100644 to 100755.