Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 16:29:34 +0000 (09:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 16:29:34 +0000 (09:29 -0700)
commit9c0fc4e28b57c5a6da7b58d60f71476c64d457a6
treeba43e074d23f59bed6a6dc121ddc56d8f3b27401
parent86df86424939d316b1f6cfac1b6204f0c7dee317
parent138c9021ca68d6f8a6fac3418995fee102a3cc22
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] protect _PAGE_SPECIAL bit against mprotect