Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jan 2013 00:58:26 +0000 (11:58 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jan 2013 00:58:26 +0000 (11:58 +1100)
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()


Trivial merge