]> git.openfabrics.org - ~shefty/rdma-dev.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)
commit4ad48bb72cfaecd10f70b3a56deb12cb0f7c0b02
treece4ead44c36b46b7aa03bd20f14a7363f532a377
parent976bacef40c66443173283cc02b537e37a62c981
parent7f0bc6c0d45497a0191e99426785954bcbda3c6c
Merge branch 'for-linus' of git://git./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