From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 20:03:57 +0000 (-0800)
Subject: Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.14-rc1~165
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a0fede97fd52a5c9789d1d54ebd3b46878151c3;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

2a0fede97fd52a5c9789d1d54ebd3b46878151c3