diff options
author | 2016-05-09 09:29:13 +0200 | |
---|---|---|
committer | 2016-05-09 09:29:13 +0200 | |
commit | 7844b8927e78bfb060ba88c36c99d3e07c3fb631 (patch) | |
tree | 9992206cd2beb8de57d90ac3691cf670ddd15222 /tools/perf/scripts/python/net_dropmonitor.py | |
parent | Merge tag 'usb-serial-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next (diff) | |
parent | Linux 4.6-rc7 (diff) | |
download | wireguard-linux-7844b8927e78bfb060ba88c36c99d3e07c3fb631.tar.xz wireguard-linux-7844b8927e78bfb060ba88c36c99d3e07c3fb631.zip |
Merge 4.6-rc7 into usb-next
We want the USB fixes in here to resolve merge issues and make it easier
for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions