Merge 3.18-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Dec 2014 03:21:03 +0000 (19:21 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Dec 2014 03:21:03 +0000 (19:21 -0800)
commitc00552ebafddfe6abb397d957004f165e010abd2
treeb397d6773b545755ffdae7566f8b96b08ee54ebb
parent842f57baab186417d89810f3dd6147f1ef3009dd
parent009d0431c3914de64666bec0d350e54fdd59df6a
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>
drivers/usb/dwc3/ep0.c
drivers/usb/host/xhci-plat.c