tree 6343600c318c600f0dcdf71406bf7d993823afd4
parent 96e1a87392293cf895ea99ab70758453897c7bbf
parent dc64bef5439c8e1fafea225054da4d8882c9d10c
author Linus Torvalds <torvalds@g5.osdl.org> 1160151233 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1160151233 -0700

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.