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)
commit50ee9339c7347c2b16fa79d43777f72e9f41ef5a
treece09aa147e5c8bb74c72c46cebfdbffeece6678f
parentf0e615c3cb72b42191b558c130409335812621d8
parent98346f7db014614a4814eb60639f651f8bbc591d
Merge 2.6.39-rc4 into usb-next

This is needed to help resolve some xhci issues and other minor
differences.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/Kconfig
drivers/usb/core/devices.c
drivers/usb/host/ehci-q.c