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)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix address masking bug in hpte_need_flush()


Trivial merge