projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68465bb 5e95235)
Merge tag 'powerpc-4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 May 2015 18:19:49 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 May 2015 18:19:49 +0000 (11:19 -0700)
commit416716ed390782e373875f39b39ee23c91902688
treeaebef7c785d76634dc2b15803f590101ddbf1cebtree | snapshot
parent68465bb08ca68ab00997ff54a3a27dcb8c541357commit | diff
parent5e95235ccd5442d4a4fe11ec4eb99ba1b7959368commit | diff
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.
John Crispins staging tree