Merge branch 'x86/urgent' into x86/asm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/lib/copy_user_64.S
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/mm_types.h
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mmap.c
Simple merge