From: Greg Kroah-Hartman Date: Sat, 10 Dec 2011 00:07:37 +0000 (-0800) Subject: Merge v3.2-rc4 into usb-next X-Git-Tag: MMI-PSA29.97-13-9~17726^2~43 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a36ae95c4e220afb976dd9d0d813d01e882b7b59;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- a36ae95c4e220afb976dd9d0d813d01e882b7b59