From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Dec 2011 23:35:16 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=35337c834124d2893b7fe4ba683c7639e6c37e0c;p=~shefty%2Frdma-dev.git

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

35337c834124d2893b7fe4ba683c7639e6c37e0c