From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Nov 2012 04:53:26 +0000 (-1000)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.7-rc7~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99b6e1e7233073a23a20824db8c5260a723ed192;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull missed powerpc fixes from Benjamin Herrenschmidt:
 "Here are small 52xx fixes that Anatolij asked me to pull a while back
  and that I completely missed.  The stuff is local to that platform
  code, and was in next for a while, so it should still go into 3.7."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mpc5200: move lpbfifo node and fix its interrupt property
  powerpc: 52xx: nop out unsupported critical IRQs
  powerpc/pcm030: add pcm030-audio-fabric to dts
---

99b6e1e7233073a23a20824db8c5260a723ed192