]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Nov 2012 05:57:56 +0000 (06:57 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Nov 2012 05:57:56 +0000 (06:57 +0100)
commit68d778bd2173a5fe09714c2f87bf541e36481eeb
treece4ead44c36b46b7aa03bd20f14a7363f532a377
parent93f300900aed86d35d3948c4071f3420ec7d538e
parentf4e032b1625a18e8e9e5d819467597ade9edc29e
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes.  I keep the fingers crossed that we now got
  transparent huge pages ready for prime time."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cio: fix length calculation in idset.c
  s390/sclp: fix addressing mode clobber
  s390: Move css limits from drivers/s390/cio/ to include/asm/.
  s390/thp: respect page protection in pmd_none() and pmd_present()
  s390/mm: use pmd_large() instead of pmd_huge()
  s390/cio: suppress 2nd path verification during resume