From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 May 2015 18:19:49 +0000 (-0700)
Subject: Merge tag 'powerpc-4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
X-Git-Tag: firefly_0821_release~176^2~1754
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=416716ed390782e373875f39b39ee23c91902688;p=firefly-linux-kernel-4.4.55.git

Merge tag 'powerpc-4.1-4' of git://git./linux/kernel/git/mpe/linux

Pull powerpc fixes from Michael Ellerman:

 - THP/hugetlb fixes from Aneesh.

 - MCE fix from Daniel.

 - TOC fix from Anton.

* tag 'powerpc-4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc: Align TOC to 256 bytes
  powerpc/mce: fix off by one errors in mce event handling
  powerpc/mm: Return NULL for not present hugetlb page
  powerpc/thp: Serialize pmd clear against a linux page table walk.
---

416716ed390782e373875f39b39ee23c91902688