From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 15 Dec 2006 18:22:22 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.20-rc2~127
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=701dfbe71903413d10caf2790259bccbabbedcf5;p=~shefty%2Frdma-dev.git

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: css_register_subchannel race.
  [S390] Save prefix register for dump on panic
  [S390] Fix reboot hang
  [S390] Fix reboot hang on LPARs
  [S390] sclp_cpi module license.
  [S390] zcrypt: module unload fixes.
  [S390] Hipersocket multicast queue: make sure outbound handler is called
  [S390] hypfs fixes
  [S390] update default configuration
---

701dfbe71903413d10caf2790259bccbabbedcf5