please pull powerpc-merge.git

[Paul Mackerras]

Linus,

Please pull

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

There is a fix for a bug in making IOMMU entries on partitioned
pSeries systems when 64k pages are used, and a correction for the help
text of a config option.

Thanks,
Paul.

Michal Ostrowski:
      powerpc/pseries: Fix TCE building with 64k pagesize

Olaf Hering:
      powerpc: correct the NR_CPUS description text

 arch/powerpc/Kconfig                   |    2 +-
 arch/powerpc/platforms/pseries/iommu.c |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)