[Cbe-oss-dev] please pull merge branch of cell-2.6.git

[Arnd Bergmann]

Hi Paul,

Please pull the fix I just sent from

  master.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6.git merge

Jeremy might want to look at it as well, since he wrote the
code originally.

Thanks,

	Arnd <><

---
Arnd Bergmann <arnd at arndb.de>:
     powerpc/cell: disable ptcal in case of kdump reboot

 arch/powerpc/platforms/cell/ras.c      |    6 ++++++
 arch/powerpc/platforms/cell/ras.h      |    1 +
 arch/powerpc/platforms/cell/setup.c    |    2 +-
 arch/powerpc/platforms/pseries/kexec.c |    2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)