Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 15:40:46 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 15:40:46 +0000 (08:40 -0700)
commit95237b80a3021ce5abb4d9ad330355549026f9c3
tree8c816393b87d0a90c3a94d52e29bd3ac50d9f4d1
parentcf4b0b2c9520728e170f7a3061e24dbae0b56ed4
parent61e9916eba35dfb76d38013a5aae9a59cc50877a
Merge branch 'merge' of git://git./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