From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 27 Aug 2007 16:42:21 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.23-rc4~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96665822dc43957d4337509e138017dc1cb960b1;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix SLB initialization at boot time
  [POWERPC] Fix undefined reference to device_power_up/resume
  [POWERPC] cell: Update cell_defconfig for 2.6.23
  [POWERPC] axonram: Do not delete gendisks queue in error path
  [POWERPC] axonram: Module modification for latest firmware API changes
  [POWERPC] cell: Support pinhole-reset on IBM cell blades
  [POWERPC] spu_manage: Use newer physical-id attribute
  [POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
---

96665822dc43957d4337509e138017dc1cb960b1