From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Nov 2012 05:57:56 +0000 (+0100)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.7-rc5~12
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=4ad48bb72cfaecd10f70b3a56deb12cb0f7c0b02;p=~andy%2Flinux

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
---

4ad48bb72cfaecd10f70b3a56deb12cb0f7c0b02