Merge branch 'linus' into auto-latest

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

diff --cc arch/arm/mach-integrator/pci_v3.c
Simple merge

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

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc tools/perf/util/symbol.c
Simple merge