diff options
author | 2015-10-28 13:17:01 +0100 | |
---|---|---|
committer | 2015-10-28 13:17:20 +0100 | |
commit | e4340bbb07dd38339c0773543dd928886e512a57 (patch) | |
tree | f38d9d2f929037325362328415b2a1e7bfe52a15 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu (diff) | |
parent | block: re-add discard_granularity and alignment checks (diff) | |
download | wireguard-linux-e4340bbb07dd38339c0773543dd928886e512a57.tar.xz wireguard-linux-e4340bbb07dd38339c0773543dd928886e512a57.zip |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions