Merge branches 'x86/fpu', 'x86/mm' and 'x86/asm' into x86/pkeys
authorIngo Molnar <mingo@kernel.org>
Tue, 16 Feb 2016 08:37:37 +0000 (09:37 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 16 Feb 2016 08:37:37 +0000 (09:37 +0100)
commit1fe3f29e4a908461be16a9388e73837157cc7942
tree49d1b6a457d0faaccf477d7100fe9778fc637730
parent1926e54f115725a9248d0c4c65c22acaf94de4c4
parent58122bf1d856a4ea9581d62a07c557d997d46a19
parente2c7698cd61f11d4077fdb28148b2d31b82ac848
parentf2cc8e0791c70833758101d9756609a08dd601ec
Merge branches 'x86/fpu', 'x86/mm' and 'x86/asm' into x86/pkeys

Provide a stable basis for the pkeys patches, which touches various
x86 details.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
13 files changed:
Documentation/kernel-parameters.txt
arch/x86/include/asm/fpu/internal.h
arch/x86/include/asm/processor.h
arch/x86/include/asm/tlbflush.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/head_32.S
arch/x86/kernel/traps.c
arch/x86/mm/setup_nx.c
fs/btrfs/disk-io.c
include/linux/mm.h
include/linux/mm_types.h
mm/memory.c
mm/mmap.c