diff options
author | 2017-11-09 18:26:51 -0800 | |
---|---|---|
committer | 2017-11-09 18:26:51 -0800 | |
commit | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (patch) | |
tree | 3960ffcd424c9b61c485d6cc2966440c67f15485 /tools/perf/scripts/python/stackcollapse.py | |
parent | Merge tag 'pci-v4.14-fixes-7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (diff) | |
parent | MAINTAINERS: update TPM driver infrastructure changes (diff) | |
download | wireguard-linux-1c9dbd4615fd751e5e0b99807a3c7c8612e28e20.tar.xz wireguard-linux-1c9dbd4615fd751e5e0b99807a3c7c8612e28e20.zip |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"2 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
MAINTAINERS: update TPM driver infrastructure changes
sysctl: add register_sysctl() dummy helper
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions