Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commit38407aad0d1860515223075f33843a386277a30a
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2008 23:46:28 +0000 (6 15:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2008 23:46:28 +0000 (6 15:46 -0800)
tree05659e9527ff0c76c18dd47948bae3bfb6fc3ea9
parent39d4e58d36321b3c3b4025d9bf28bf026c2a5bb1
parent454666eb78d890f5740ea1901f8b01a43c77c67c
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 "unused variable" warning in pci_dlpar.c
  powerpc/cell: Fix compile error in ras.c
  powerpc/ps3: Fix compile error in ps3-lpm.c