diff options
author | 2016-12-14 11:14:00 +0000 | |
---|---|---|
committer | 2016-12-14 11:14:00 +0000 | |
commit | ed141f2890cdb738fc7131367f5fb15632bc3e60 (patch) | |
tree | e6fd1b117b7d8968855e7f2d2f209ae102bf0be8 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus (diff) | |
parent | ARM: wire up new pkey syscalls (diff) | |
download | linux-dev-ed141f2890cdb738fc7131367f5fb15632bc3e60.tar.xz linux-dev-ed141f2890cdb738fc7131367f5fb15632bc3e60.zip |
Merge branch 'syscalls' into for-linus
Conflicts:
arch/arm/include/asm/unistd.h
arch/arm/include/uapi/asm/unistd.h
arch/arm/kernel/calls.S
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions