Merge 3.18-rc7 into usb-next

We need the xhci fixes here and this resolves a merge issue with
drivers/usb/dwc3/ep0.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/dwc3/ep0.c
index baeedbd67f77bb8f68b460c164fa47dc205faf07,df38e7ef49761ce87f3532c37c556a1399ab8199..1bc77a3b499788803f125a94d5855c198ee9f634
--- 1/drivers/usb/dwc3/ep0.c
--- 2/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@@ -791,8 -791,10 +791,12 @@@ static void dwc3_ep0_complete_data(stru
  
        trb = dwc->ep0_trb;
  
 +      trace_dwc3_complete_trb(ep0, trb);
 +
+       r = next_request(&ep0->request_list);
+       if (!r)
+               return;
+ 
        status = DWC3_TRB_SIZE_TRBSTS(trb->size);
        if (status == DWC3_TRBSTS_SETUP_PENDING) {
                dwc3_trace(trace_dwc3_ep0, "Setup Pending received");

diff --cc drivers/usb/host/xhci-plat.c
Simple merge