Merge 3.0-rc2 into usb-linus as it's needed by some USB patches
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 14 Jun 2011 13:51:10 +0000 (06:51 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 14 Jun 2011 13:51:23 +0000 (06:51 -0700)
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge