summaryrefslogtreecommitdiffstats
path: root/drivers/dma/ste_dma40_ll.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-30 19:21:03 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-30 19:21:03 -0800
commitc00552ebafddfe6abb397d957004f165e010abd2 (patch)
treeb397d6773b545755ffdae7566f8b96b08ee54ebb /drivers/dma/ste_dma40_ll.c
parent842f57baab186417d89810f3dd6147f1ef3009dd (diff)
parent009d0431c3914de64666bec0d350e54fdd59df6a (diff)
downloadblackbird-op-linux-c00552ebafddfe6abb397d957004f165e010abd2.tar.gz
blackbird-op-linux-c00552ebafddfe6abb397d957004f165e010abd2.zip
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>
Diffstat (limited to 'drivers/dma/ste_dma40_ll.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud