Merge tag 'for-usb-next-2012-05-21' of git://git.kernel.org/pub/scm/linux/kernel...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 May 2012 16:59:23 +0000 (09:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 May 2012 16:59:23 +0000 (09:59 -0700)
commitcda4db53e9c28061c100400e1a4d273ea61dfba9
tree42fe432a412fdbd2313d3d0270b53e0877594316
parent8e192910d96615a32646b8978b201b650f62ef34
parentc88db160a30cccb81303212b256680f2e37e35ae
Merge tag 'for-usb-next-2012-05-21' of git://git./linux/kernel/git/sarah/xhci into usb-next

xhci/usb: Build error fixes for 3.5

Hi Greg,

Here's four patches that fix the build errors introduced by the USB 3.0 Link PM
patches.  Please pull for inclusion in 3.5.

Sarah Sharp