Merge 3.2-rc1 into usb-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 8 Apr 2012 15:26:51 +0000 (08:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 8 Apr 2012 15:26:51 +0000 (08:26 -0700)
This is needed to catch the resume bug that was bothering lots of us from
testing some XHCI bug fixes in the suspend/resume path.

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

Trivial merge