]> err.no Git - linux-2.6/commitdiff
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)
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] protect _PAGE_SPECIAL bit against mprotect


Trivial merge