Merge branch 'x86/urgent' into x86/pat

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

diff --cc arch/ia64/kernel/iosapic.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/mm/pat.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/pci/dmar.c
Simple merge

diff --cc drivers/pci/intr_remapping.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge