tree 03eff0d444620fc32c54c16f66aed5ddeefd01ab
parent de7c6d15e354bc94a846f03749819768c331280a
parent 93ce4e2d2d7404e80d5612fb1cc13d4aad5e42fc
author Linus Torvalds <torvalds@linux-foundation.org> 1205979056 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1205979056 -0700

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