Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:28:26 +0000 (19:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:28:26 +0000 (19:28 -0700)
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] cio: fix cio_tpi ignoring adapter interrupts
  [S390] gmap: always up mmap_sem properly
  [S390] Do not clobber personality flags on exec


Trivial merge