Merge 3.5-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:16:12 +0000 (09:16 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:16:12 +0000 (09:16 -0700)
This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next
so that everyone can sync up properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge