From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 8 Feb 2008 17:31:42 +0000 (-0800)
Subject: Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus... 
X-Git-Tag: v3.12-rc1~22934
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dde0013782dbd09e1cc68ca03860f3a62b03cb34;p=kernel%2Fkernel-generic.git

Merge branch 'for-2.6.25' of git://git./linux/kernel/git/paulus/powerpc

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Add arch-specific walk_memory_remove() for 64-bit powerpc
  [POWERPC] Enable hotplug memory remove for 64-bit powerpc
  [POWERPC] Add remove_memory() for 64-bit powerpc
  [POWERPC] Make cell IOMMU fixed mapping printk more useful
  [POWERPC] Fix potential cell IOMMU bug when switching back to default DMA ops
  [POWERPC] Don't enable cell IOMMU fixed mapping if there are no dma-ranges
  [POWERPC] Fix cell IOMMU null pointer explosion on old firmwares
  [POWERPC] spufs: Fix timing dependent false return from spufs_run_spu
  [POWERPC] spufs: No need to have a runnable SPU for libassist update
  [POWERPC] spufs: Update SPU_Status[CISHP] in backing runcntl write
  [POWERPC] spufs: Fix state_mutex leaks
  [POWERPC] Disable G5 NAP mode during SMU commands on U3
---

dde0013782dbd09e1cc68ca03860f3a62b03cb34