tree 4f3d0d5f685a735d5d6265c1b3cafda71ff0683e
parent 0a6a2daf1c7a30c3ca66a8ddb8fc4ff7820051e2
parent 6b16351acbd415e66ba16bf7d473ece1574cf0bc
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1340640662 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1340640742 -0700

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>