Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 19 Oct 2006 00:49:42 +0000 (17:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 19 Oct 2006 00:49:42 +0000 (17:49 -0700)
commit6a13a857becef065cd138b67c162dc5c5dd88655
treead109960ad4fde202a50ead1b543168bbaaa86b9
parent3bee9df0ab55add6f8df92267a8a3d9d339cce08
parentce9b18f5cdd628196ca13bb783e8dcd5ad29ceaa
Merge branch 'for-linus' of git://git390.osdl.marist.edu/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