Merge 3.5-rc4 into usb-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:11:02 +0000 (09:11 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:12:22 +0000 (09:12 -0700)
commit8f8741ca5e55a35dafa35f4eac2b70b08fae997e
tree4f3d0d5f685a735d5d6265c1b3cafda71ff0683e
parent0a6a2daf1c7a30c3ca66a8ddb8fc4ff7820051e2
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc
Merge 3.5-rc4 into usb-linus

This is needed to sync up with the previous USB changes that were merged in
Linus's branch.

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