From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Sep 2008 15:40:46 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.27-rc9~54
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=95237b80a3021ce5abb4d9ad330355549026f9c3;p=linux-2.6-omap-h63xx.git

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix failure to shutdown with CPU hotplug
  powerpc: Fix PCI in Holly device tree
---

95237b80a3021ce5abb4d9ad330355549026f9c3