From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 19 Jun 2007 15:07:08 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.22-rc6~85
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=710675d3609b1123a40db1eb28bf34041b1d37f2;p=linux-2.6

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] Move psw_set_key.
  [S390] Add oops_enter()/oops_exit() calls to die().
  [S390] Print list of modules on die().
  [S390] Fix yet another two section mismatches.
  [S390] Fix zfcpdump header
  [S390] Missing blank when appending cio_ignore kernel parameter
---

710675d3609b1123a40db1eb28bf34041b1d37f2