Merge v3.2-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 10 Dec 2011 00:07:37 +0000 (16:07 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 10 Dec 2011 00:07:48 +0000 (16:07 -0800)
This lets us handle the PS3 merge easier, as well as syncing up with
other USB fixes already in the -rc4 tree.

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

Trivial merge