diff options
author | 2016-08-12 12:39:02 -0700 | |
---|---|---|
committer | 2016-08-12 12:39:02 -0700 | |
commit | 0e1117b2572b82ddc329d570f7c9bab355e4dc3b (patch) | |
tree | ece82dede09c11725409f0b5f6dd1a8b21855174 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'nfs-for-4.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
parent | efi/capsule: Allocate whole capsule into virtual memory (diff) | |
download | linux-rng-0e1117b2572b82ddc329d570f7c9bab355e4dc3b.tar.xz linux-rng-0e1117b2572b82ddc329d570f7c9bab355e4dc3b.zip |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"A fix for EFI capsules and an SGI UV platform fix"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/capsule: Allocate whole capsule into virtual memory
x86/platform/uv: Skip UV runtime services mapping in the efi_runtime_disabled case
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions