tree e067c1b262b5c07fdbbee9296651d7182ddc2ebe
parent 5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c
parent a681887f7b0f8b7698e4b22f1191015424fa96e4
author Linus Torvalds <torvalds@linux-foundation.org> 1317349706 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317349706 -0700

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* '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