Merge 2.6.39-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 19 Apr 2011 12:50:26 +0000 (05:50 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 19 Apr 2011 12:50:38 +0000 (05:50 -0700)
This is needed to help resolve some xhci issues and other minor
differences.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge