From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Mar 2008 02:10:56 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.25-rc7~64
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=635440c0235537a3f0a90ed5b6f8cd8a5da862de;p=~shefty%2Frdma-dev.git

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Update some defconfigs
  [POWERPC] Hide resources on Axon PCIE root complex nodes
  [POWERPC] Fix cell IOMMU code to cope with empty dma-ranges and non-PCI devices
  [POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs
  [POWERPC] Fix PMU + soft interrupt disable bug
  [POWERPC] user_regset PTRACE_SETREGS regression fix
---

635440c0235537a3f0a90ed5b6f8cd8a5da862de