Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Feb 2010 15:16:58 +0000 (07:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Feb 2010 15:16:58 +0000 (07:16 -0800)
commit53910146dfc118d9f86eeb88775ccd6fafebb09d
tree1fc312c78d4fc04ff64383ed5c07b6fb16346b13
parent5551638acb3dbfa1c92335464158fccfa46f5a00
parent77058e1adcc439151db41f2b84e4867a88113cd8
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: Fix address masking bug in hpte_need_flush()