From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jan 2013 00:58:26 +0000 (+1100)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.8-rc6~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8e5d573a6acfb129513cc929a731eeae37eddeee;p=linux-2.6-block.git

Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull one s390 fix from Martin Schwidefsky:
 "Another transparent huge page fix, we need to define a s390 variant
  for pmdp_set_wrprotect to flush the TLB for the huge page correctly."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/thp: implement pmdp_set_wrprotect()
---

8e5d573a6acfb129513cc929a731eeae37eddeee