| commit | 09091a4d5f2dd378dcf71de50b48cdacc58a8ac0 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Apr 22 15:25:26 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Apr 22 15:25:26 2012 -0700 |
| tree | d50e37ebb5591fa1e723f32bde077dbdf726b78b | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c [diff] | |
| parent | 3a1c2a82204f5376f484d82cb18189afc2145c77 [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>