| commit | 6a13a857becef065cd138b67c162dc5c5dd88655 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Oct 18 17:49:42 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Oct 18 17:49:42 2006 -0700 |
| tree | ad109960ad4fde202a50ead1b543168bbaaa86b9 | |
| parent | 3bee9df0ab55add6f8df92267a8a3d9d339cce08 [diff] | |
| parent | ce9b18f5cdd628196ca13bb783e8dcd5ad29ceaa [diff] |
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