From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jun 2008 17:23:29 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.26-rc6~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b;p=linux-2.6-omap-h63xx.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG
  [POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n
  [POWERPC] Use dev_set_name in pci_64.c
  [POWERPC] Fix incorrect enabling of VMX when building signal or user context
  [POWERPC] boot/Makefile CONFIG_ variable fixes
---

64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b