From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 17:21:19 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.5-rc1~129
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=e7b30a17c1ef5cbc67c5381407d2d03484b8def3;p=karo-tx-linux.git

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/urgent branch from Ingo Molnar:
 "These are the fixes left over from the very end of the v3.4
  stabilization cycle, plus one more fix."

Ugh.  Those KERN_CONT additions are just pointless.  I think they came
as a reaction to some of the early (broken) printk() work - but that was
fixed before it was merged.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, relocs: Build clean fix
  x86, printk: Add missing KERN_CONT to NMI selftest
  x86: Fix boot on Twinhead H12Y
---

e7b30a17c1ef5cbc67c5381407d2d03484b8def3