diff options
author | 2017-10-23 17:21:44 +0200 | |
---|---|---|
committer | 2017-10-23 17:21:44 +0200 | |
commit | 6fbf248a20d362a92de60beee9474faca0b54eee (patch) | |
tree | b5365be73b420be3b6036fb40aaf1b167c90b180 /tools/perf/scripts/python/call-graph-from-sql.py | |
parent | genwqe: Take R/W permissions into account when dealing with memory pages (diff) | |
parent | Linux 4.14-rc6 (diff) | |
download | wireguard-linux-6fbf248a20d362a92de60beee9474faca0b54eee.tar.xz wireguard-linux-6fbf248a20d362a92de60beee9474faca0b54eee.zip |
Merge 4.14-rc6 into char-misc-next
We want the driver fixes in here and this resolves a merge issue with
the binder driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-sql.py')
0 files changed, 0 insertions, 0 deletions