| commit | da104a83692cf07434ab3b20bf10093bdbc3f97e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 06 09:13:53 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 06 09:13:53 2006 -0700 |
| tree | 6343600c318c600f0dcdf71406bf7d993823afd4 | |
| parent | 96e1a87392293cf895ea99ab70758453897c7bbf [diff] | |
| parent | dc64bef5439c8e1fafea225054da4d8882c9d10c [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] Use CONFIG_GENERIC_TIME and define TOD clock source. [PATCH] sysrq: irq change build fix. [S390] irq change build fixes. [S390] cio: 0 is a valid chpid. [S390] monwriter buffer limit. [S390] ap bus poll thread priority.