diff options
author | 2014-11-30 19:21:03 -0800 | |
---|---|---|
committer | 2014-11-30 19:21:03 -0800 | |
commit | c00552ebafddfe6abb397d957004f165e010abd2 (patch) | |
tree | b397d6773b545755ffdae7566f8b96b08ee54ebb /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing (diff) | |
parent | Linux 3.18-rc7 (diff) | |
download | wireguard-linux-c00552ebafddfe6abb397d957004f165e010abd2.tar.xz wireguard-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 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions