Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
commit6edacf05c8362f4c368991b55d85e8122cfc9a24
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2013 05:58:41 +0000 (4 16:58 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2013 05:58:41 +0000 (4 16:58 +1100)
tree707dda607c42ec5f618b1fe6166775e9af8dd1f8
parentf19637e74309df700e9f731cffdc2427ab2d2c23
parenteda8eebdd153c48a4e2a3a3ac3cd9e2e31f5c6b3
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc update from Benjamin Herrenschmidt:
 "Just so that you don't get too bored on your Island here's a patch for
  3.8 fixing a nasty bug that affects the new 64T support that was
  merged in 3.7.  Please apply whenever you have a chance (and an
  internet connection!)"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mm: Fix hash computation function