Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 19:09:32 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 19:09:32 +0000 (12:09 -0700)
commit60a0cd528d761c50d3a0a49e8fbaf6a87e64254a
tree4eca8970064738311f602c1fb606ecb2520a4e68
parente25e0920b5f0f2d46d16f14f7f51ccbfd0773671
parent8e35961b57da14cb64cb0e4e1b7e3aabda6396fe
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/mm: Fix broken MMU PID stealing on !SMP