[git pull] Please pull powerpc.git merge branch

[Benjamin Herrenschmidt]

Hi Linus !

Here's a handful of powerpc fixes for 2.6.34, along with a patch
from Fujita Tomonori to remove a config option that is mostly
useless nowadays.

Cheers,
Ben.

The following changes since commit 39710479303fd3affb3e204e9a7a75cc676977b5:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../vapier/blackfin

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (1):
      Merge commit 'kumar/merge' into merge

FUJITA Tomonori (2):
      powerpc: Fix swiotlb to respect the boot option
      powerpc: Remove IOMMU_VMERGE config option

Kumar Gala (2):
      powerpc/85xx: Make sure lwarx hint isn't set on ppc32
      powerpc/fsl-booke: Get coherent bit from PTE

Márton Németh (1):
      powerpc: Do not call prink when CONFIG_PRINTK is not defined

Nathan Lynch (1):
      powerpc: Use correct ccr bit for syscall error status

 arch/powerpc/Kconfig                  |   13 -------------
 arch/powerpc/include/asm/ppc-opcode.h |    6 +++---
 arch/powerpc/include/asm/syscall.h    |    6 +++---
 arch/powerpc/kernel/head_fsl_booke.S  |    7 ++++---
 arch/powerpc/kernel/iommu.c           |    7 +------
 arch/powerpc/kernel/setup_32.c        |    6 ------
 arch/powerpc/kernel/setup_64.c        |    6 ------
 arch/powerpc/mm/mem.c                 |    6 ++++++
 8 files changed, 17 insertions(+), 40 deletions(-)