From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Nov 2008 23:46:28 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.28-rc4~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38407aad0d1860515223075f33843a386277a30a;p=platform%2Fkernel%2Flinux-stable.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 "unused variable" warning in pci_dlpar.c
  powerpc/cell: Fix compile error in ras.c
  powerpc/ps3: Fix compile error in ps3-lpm.c
---

38407aad0d1860515223075f33843a386277a30a