projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 66f75a5 3a1c2a8)
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)
commit09091a4d5f2dd378dcf71de50b48cdacc58a8ac0
treed50e37ebb5591fa1e723f32bde077dbdf726b78btree | snapshot (tar.gz zip)
parent66f75a5d028beaf67c931435fdc3e7823125730ccommit | diff
parent3a1c2a82204f5376f484d82cb18189afc2145c77commit | diff
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 diff1 | diff2 | blob | history
drivers/usb/host/ehci-fsl.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-hcd.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-hub.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-tegra.c diff1 | diff2 | blob | history
drivers/usb/misc/yurex.c diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history