tree 9a519b52ea5b8cdb72413a4c13c3596f75f90d52
parent 8c9b04346c0ae302d8b7b7df16cc19ddff77742e
parent 75464960fc0ccc505527edc1459c8ad191fbc0cc
author Linus Torvalds <torvalds@linux-foundation.org> 1323128116 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323128116 -0800

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] ap: Setup timer for sending messages after reset.
  [S390] cio: fix chsc_chp_vary
  [S390] cio: provide fake irb for transport mode IO
  [S390] cio: disallow driver io for known to be broken paths
  [S390] hibernate: directly trigger subchannel evaluation
  [S390] remove reset of system call restart on psw changes
  [S390] add missing .set function for NT_S390_LAST_BREAK regset
  [S390] fix page change underindication in pgste_update_all
  [S390] ptrace inferior call interactions with TIF_SYSCALL
  [S390] kdump: Replace is_kdump_kernel() with OLDMEM_BASE check