mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
e3e9fc7fa7
We need the USB fixes in here and this resolves merge conflicts as reported in linux-next in the following files: drivers/usb/host/xhci.c drivers/usb/host/xhci.h drivers/usb/typec/ucsi/ucsi.c Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| sisusbvga | ||
| adutux.c | ||
| apple-mfi-fastcharge.c | ||
| appledisplay.c | ||
| brcmstb-usb-pinmap.c | ||
| chaoskey.c | ||
| cypress_cy7c63.c | ||
| cytherm.c | ||
| ehset.c | ||
| emi26.c | ||
| emi62.c | ||
| ezusb.c | ||
| ftdi-elan.c | ||
| idmouse.c | ||
| iowarrior.c | ||
| isight_firmware.c | ||
| Kconfig | ||
| ldusb.c | ||
| legousbtower.c | ||
| lvstest.c | ||
| Makefile | ||
| onboard_usb_hub.c | ||
| onboard_usb_hub.h | ||
| onboard_usb_hub_pdevs.c | ||
| qcom_eud.c | ||
| trancevibrator.c | ||
| usb251xb.c | ||
| usb3503.c | ||
| usb4604.c | ||
| usb_u132.h | ||
| usblcd.c | ||
| usbsevseg.c | ||
| usbtest.c | ||
| uss720.c | ||
| yurex.c | ||