tree 05659e9527ff0c76c18dd47948bae3bfb6fc3ea9
parent 39d4e58d36321b3c3b4025d9bf28bf026c2a5bb1
parent 454666eb78d890f5740ea1901f8b01a43c77c67c
author Linus Torvalds <torvalds@linux-foundation.org> 1226015188 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226015188 -0800

Merge branch 'merge' of git://git.kernel.org/pub/scm/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