tree d132d3296a7c44bb26659d698d0fdd4a05db1767
parent a44f99c7efdb88fa41128065c9a9445c19894e34
parent a71f5d5d279375205009a4be56a3cf6682921292
author Linus Torvalds <torvalds@linux-foundation.org> 1300726347 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300726347 -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/ptrace: Remove BUG_ON when full register set not available
  powerpc: Factoring mpic cpu id fetching into a function
  powerpc: Make MPIC honor the "pic-no-reset" device tree property
  powerpc: Document the Open PIC device tree binding
  powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodes