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)
commita36ae95c4e220afb976dd9d0d813d01e882b7b59
tree5a128e3f6a5a0d29c9dfd81a116381452951318f
parentb870defebde40d01d951c9affd86c59841757c31
parent5611cc4572e889b62a7b4c72a413536bf6a9c416
Merge v3.2-rc4 into usb-next

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>