From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Nov 2008 02:53:02 +0000 (-0800)
Subject: Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux... 
X-Git-Tag: v2.6.28-rc6~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3108864e2d70891d30d60af6af256a1b517d7078;p=linux-2.6-omap-h63xx.git

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

* 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: make NUMA on 32-bit depend on EXPERIMENTAL again
  x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set
---

3108864e2d70891d30d60af6af256a1b517d7078