From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Jan 2011 04:27:25 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12fcdba1b7ae8b25696433f420b775aeb556d89b;p=thirdparty%2Fkernel%2Flinux.git

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Unify "numa=" command line option handling
  Revert "x86: Make relocatable kernel work with new binutils"
---

12fcdba1b7ae8b25696433f420b775aeb556d89b