Merge branch 'usb-linus' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Feb 2012 23:10:01 +0000 (15:10 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Feb 2012 23:10:12 +0000 (15:10 -0800)
commit50e5dfb6c4111c860bfa4d93dfe115bedf6b0fb1
tree1785659e73faee5968c2f4fb1a1a18bb77c22ca3
parent5ee71cf3bef66ad9683c681e48628fae057f8e18
parentb7bc5925a9aafae970c3db1f118c97a7d503114e
Merge branch 'usb-linus' into usb-next

This is needed so that Sarah can queue up some xhci changes for 3.4

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