tree a3bff5de25890f6de94cbf431bb0f94073893507
parent cf3966bf6ecfe25a75d625771e327b84878bc09d
parent 191aee58b6568cf8143901bfa3f57a9b8faa6f1c
author Linus Torvalds <torvalds@linux-foundation.org> 1269031363 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269031363 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Remove IOMMU_VMERGE config option
  powerpc: Fix swiotlb to respect the boot option
  powerpc: Do not call prink when CONFIG_PRINTK is not defined
  powerpc: Use correct ccr bit for syscall error status
  powerpc/fsl-booke: Get coherent bit from PTE
  powerpc/85xx: Make sure lwarx hint isn't set on ppc32