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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| cdns3-debug.h | ||
| cdns3-ep0.c | ||
| cdns3-gadget.c | ||
| cdns3-gadget.h | ||
| cdns3-imx.c | ||
| cdns3-pci-wrap.c | ||
| cdns3-plat.c | ||
| cdns3-ti.c | ||
| cdns3-trace.c | ||
| cdns3-trace.h | ||
| cdnsp-debug.h | ||
| cdnsp-ep0.c | ||
| cdnsp-gadget.c | ||
| cdnsp-gadget.h | ||
| cdnsp-mem.c | ||
| cdnsp-pci.c | ||
| cdnsp-ring.c | ||
| cdnsp-trace.c | ||
| cdnsp-trace.h | ||
| core.c | ||
| core.h | ||
| drd.c | ||
| drd.h | ||
| gadget-export.h | ||
| host-export.h | ||
| host.c | ||