tree d30977997a8dc4574cf10ea184866b7b3c9db8b8
parent d6a3bf93d69aefa2d81b64ece799799f44acd925
parent be3286507dab888d4aad9f91fd6ff5202b24cd5b
author Linus Torvalds <torvalds@linux-foundation.org> 1359507506 +1100
committer Linus Torvalds <torvalds@linux-foundation.org> 1359507506 +1100

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()