We need the USB fixes in here for testing, and this resolves two merge conflicts, one pointed out by linux-next: drivers/usb/dwc3/dwc3-pci.c drivers/usb/host/xhci-pci.c Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| acm_ms.c | ||
| audio.c | ||
| cdc2.c | ||
| dbgp.c | ||
| ether.c | ||
| g_ffs.c | ||
| gmidi.c | ||
| hid.c | ||
| inode.c | ||
| mass_storage.c | ||
| multi.c | ||
| ncm.c | ||
| nokia.c | ||
| printer.c | ||
| raw_gadget.c | ||
| serial.c | ||
| tcm_usb_gadget.c | ||
| webcam.c | ||
| zero.c | ||