]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 3.4-rc4 into usb-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Apr 2012 22:25:26 +0000 (15:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Apr 2012 22:25:26 +0000 (15:25 -0700)
commit100a89cfd6b81095fcb64ca4b65acd7a16c1db63
treed50e37ebb5591fa1e723f32bde077dbdf726b78b
parent955374d25137c391eaf05569ccd747c346cb6db6
parent7bca2eef9651f573b6fecf7dad9ebd8ac6bd6766
Merge 3.4-rc4 into usb-next.

This resolves the conflict in:
drivers/usb/host/ehci-fsl.c
And picks up loads of xhci bugfixes to make it easier for others to test
with.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/host/ehci-fsl.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-tegra.c
drivers/usb/misc/yurex.c
drivers/usb/serial/option.c