Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 27 Aug 2007 16:42:21 +0000 (09:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 27 Aug 2007 16:42:21 +0000 (09:42 -0700)
commit96665822dc43957d4337509e138017dc1cb960b1
tree11e9a33e2f58c477db25e5a15f176534ed636d43
parentd96a2a5c6479342229416565944b56bc7a2b1a60
parent175587cca7447daf5a13e4a53d32360ed8cba804
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