Merge 3.0-rc2 + Linus's latest into usb-linus
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Jun 2011 20:50:00 +0000 (13:50 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Jun 2011 20:50:35 +0000 (13:50 -0700)
commit7e24cf43f7dcd6312473f01b59be60662232ffce
treed2bf66d51d6d5673b44986456c38b81a95a539f7
parenta26d31cef06f43a76327c21235e75450869df2b8
parent33726bf2140a0e7c9de3ccd7cba6d69962f0b773
Merge 3.0-rc2 + Linus's latest into usb-linus

This is needed to get the following MAINTAINERS patch to apply properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>