Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Apr 2012 03:56:28 +0000 (20:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Apr 2012 03:56:28 +0000 (20:56 -0700)
commit45852766a0212c2d4f0d7faa71eedbd6c1d70452
tree52d7087c519e01c5ff488c7d191c7307168f6937
parentf549e088b806f44b6ab6eeef0cb71ced1d2488dd
parentfae2e0fb24c61ca68c98d854a34732549ebc1854
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc fixes from Benjamin Herrenschmidt:
 "Fixes for two nasty regression affecting powerpc in 3.4."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix typo in runlatch code
  powerpc: Fix page fault with lockdep regression