USB: Merge 2.6.37-rc5 into usb-next

Browse source

This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

...

This commit is contained in:

Greg Kroah-Hartman 2010-12-22 12:25:34 -08:00

parent 73bc7d315f 90a8a73c06

commit 2af10844eb

184 changed files with 2079 additions and 1561 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

5

Documentation/kernel-parameters.txt

View file

4

Documentation/power/runtime_pm.txt

View file