Merge 3.0-rc2 + Linus's latest into usb-linus
authorGreg Kroah-Hartman <[email protected]>
Wed, 8 Jun 2011 20:50:00 +0000 (13:50 -0700)
committerGreg Kroah-Hartman <[email protected]>
Wed, 8 Jun 2011 20:50:35 +0000 (13:50 -0700)
This is needed to get the following MAINTAINERS patch to apply properly.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

Trivial merge