From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Mar 2011 16:52:27 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: firefly_0821_release~7613^2~2131
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=111f4268bd69cb040bf05038785cfbc4087f6341;p=firefly-linux-kernel-4.4.55.git

Merge branch 'merge' of git://git./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
---

111f4268bd69cb040bf05038785cfbc4087f6341