diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-01 04:21:03 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-01 04:21:03 +0100 |
commit | c00552ebafddfe6abb397d957004f165e010abd2 (patch) | |
tree | b397d6773b545755ffdae7566f8b96b08ee54ebb /scripts | |
parent | Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/... (diff) | |
parent | Linux 3.18-rc7 (diff) | |
download | linux-c00552ebafddfe6abb397d957004f165e010abd2.tar.xz 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 'scripts')
0 files changed, 0 insertions, 0 deletions