]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Nov 2012 04:53:26 +0000 (18:53 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Nov 2012 04:53:26 +0000 (18:53 -1000)
commit99b6e1e7233073a23a20824db8c5260a723ed192
tree37f4f608a9e96f47c9a5ce2c9109bdc4d2aa58ff
parent74dcc3f9044320a0580673827a446c9e5593dfc7
parentd6dc24613c222f9057131ccbd5264a10bcba9f97
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