Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:03:57 +0000 (12:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:03:57 +0000 (12:03 -0800)
commit2a0fede97fd52a5c9789d1d54ebd3b46878151c3
treea0a1f5bdc25491414df20ff90785ca14e3929cc3
parent06bc0f4a2e7fe54d98539686f070ceccfd73953d
parentd139336700a5f3a560da235e4dfcd286773025d4
Merge branch 'x86-cleanups-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpu, amd: Fix a shadowed variable situation
  um, x86: Fix vDSO build
  x86: Delete non-required instances of include <linux/init.h>
  x86, realmode: Pointer walk cleanups, pull out invariant use of __pa()
  x86/traps: Clean up error exception handler definitions
arch/x86/include/asm/processor.h
arch/x86/include/asm/timer.h
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/intel.c