[git pull] Please pull powerpc.git merge branch

[Kumar Gala]

The following changes since commit c60e65d7863620945d498a8ac60181077879599c:

  powerpc/pseries: Fix build without CONFIG_HOTPLUG_CPU (2011-04-05 16:22:11 +1000)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge

Kumar Gala (2):
      powerpc/book3e: Fix CPU feature handling on 64-bit e5500
      powerpc/85xx: disable Suspend support if SMP enabled

Prabhakar Kushwaha (2):
      powerpc/85xx: Don't add disabled PCIe devices
      powerpc: Check device status before adding serial device

Scott Wood (1):
      powerpc/e500mc: Remove CPU_FTR_MAYBE_CAN_NAP/CPU_FTR_MAYBE_CAN_DOZE

 arch/powerpc/Kconfig                |    2 +-
 arch/powerpc/include/asm/cputable.h |   16 ++++++++++++++--
 arch/powerpc/kernel/cputable.c      |    2 +-
 arch/powerpc/kernel/legacy_serial.c |    8 +++++---
 arch/powerpc/sysdev/fsl_pci.c       |    5 +++++
 5 files changed, 26 insertions(+), 7 deletions(-)