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>
Showing
- Documentation/devicetree/bindings/usb/spear-usb.txt 39 additions, 0 deletionsDocumentation/devicetree/bindings/usb/spear-usb.txt
- drivers/bcma/scan.c 18 additions, 1 deletiondrivers/bcma/scan.c
- drivers/staging/asus_oled/asus_oled.c 3 additions, 3 deletionsdrivers/staging/asus_oled/asus_oled.c
- drivers/staging/comedi/drivers/dt9812.c 9 additions, 7 deletionsdrivers/staging/comedi/drivers/dt9812.c
- drivers/staging/comedi/drivers/vmk80xx.c 3 additions, 1 deletiondrivers/staging/comedi/drivers/vmk80xx.c
- drivers/staging/frontier/alphatrack.c 9 additions, 6 deletionsdrivers/staging/frontier/alphatrack.c
- drivers/staging/frontier/tranzport.c 10 additions, 6 deletionsdrivers/staging/frontier/tranzport.c
- drivers/staging/line6/driver.c 3 additions, 2 deletionsdrivers/staging/line6/driver.c
- drivers/staging/line6/toneport.c 1 addition, 1 deletiondrivers/staging/line6/toneport.c
- drivers/usb/atm/ueagle-atm.c 5 additions, 10 deletionsdrivers/usb/atm/ueagle-atm.c
- drivers/usb/gadget/f_hid.c 1 addition, 1 deletiondrivers/usb/gadget/f_hid.c
- drivers/usb/gadget/fsl_udc_core.c 23 additions, 5 deletionsdrivers/usb/gadget/fsl_udc_core.c
- drivers/usb/gadget/fsl_usb2_udc.h 11 additions, 0 deletionsdrivers/usb/gadget/fsl_usb2_udc.h
- drivers/usb/host/Kconfig 33 additions, 3 deletionsdrivers/usb/host/Kconfig
- drivers/usb/host/Makefile 2 additions, 0 deletionsdrivers/usb/host/Makefile
- drivers/usb/host/bcma-hcd.c 334 additions, 0 deletionsdrivers/usb/host/bcma-hcd.c
- drivers/usb/host/ehci-fsl.c 27 additions, 9 deletionsdrivers/usb/host/ehci-fsl.c
- drivers/usb/host/ehci-fsl.h 12 additions, 1 deletiondrivers/usb/host/ehci-fsl.h
- drivers/usb/host/ehci-hcd.c 6 additions, 7 deletionsdrivers/usb/host/ehci-hcd.c
- drivers/usb/host/ehci-hub.c 9 additions, 11 deletionsdrivers/usb/host/ehci-hub.c
Loading
Please register or sign in to comment