From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Jun 2013 18:08:46 +0000 (-1000)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.10-rc7~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=53d5defcfa8c9603554a3174cbe206fb69f6e8ef;p=~emulex%2Finfiniband.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc fix fro, Benjamin Herrenschmidt:
 "We accidentally broke hugetlbfs on Freescale embedded processors which
  use a slightly different page table layout than our server processors"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix bad pmd error with book3E config
---

53d5defcfa8c9603554a3174cbe206fb69f6e8ef