please pull powerpc-merge.git

[Paul Mackerras]

Linus,

Please pull

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git

Thanks,
Paul.

Benjamin Herrenschmidt:
      powerpc: Fix a huge page bug
      powerpc: Remove debug code in hash path

David Gibson:
      powerpc: Add missing icache flushes for hugepages
      powerpc: Fix SLB flushing path in hugepage

Michal Ostrowski:
      powerpc/pseries: Fix TCE building with 64k pagesize
      Fix windfarm model-id table

Mike Kravetz:
      powerpc/pseries: boot failures on numa if no memory on node

Olaf Hering:
      powerpc: correct the NR_CPUS description text

Olof Johansson:
      powerpc: remove redundant code in stab init
      powerpc: Set cache info defaults

Paul Mackerras:
      powerpc/pseries: Optimize IOMMU setup
      ppc: Build in all three of powermac, PREP and CHRP support

 arch/powerpc/Kconfig                   |    2 -
 arch/powerpc/kernel/setup_64.c         |   10 +++
 arch/powerpc/mm/hash_utils_64.c        |    2 -
 arch/powerpc/mm/hugetlbpage.c          |   95 ++++++++++++++++++++++++++------
 arch/powerpc/mm/numa.c                 |    2 -
 arch/powerpc/mm/stab.c                 |    7 --
 arch/powerpc/platforms/pseries/iommu.c |   11 ++--
 arch/powerpc/platforms/pseries/lpar.c  |   12 ----
 arch/ppc/Kconfig                       |    6 +-
 drivers/macintosh/windfarm_pm81.c      |    4 +
 include/asm-powerpc/mmu.h              |    3 +
 11 files changed, 104 insertions(+), 50 deletions(-)