From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 19 Oct 2006 00:49:42 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.19-rc3~127
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a13a857becef065cd138b67c162dc5c5dd88655;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] update default configuration
  [S390] cio: update documentation.
  [S390] dasd: clean up timer.
  [S390] Fix pte type checking.
  [S390] monwriter find header logic.
  [S390] cio: sch_no -> schid.sch_no conversion.
  [S390] Wire up epoll_pwait syscall.
  [S390] cio: invalid device operational notification
  [S390] fix vmlinux link when CONFIG_SYSIPC=n
---

6a13a857becef065cd138b67c162dc5c5dd88655