From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Oct 2006 16:13:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=da104a83692cf07434ab3b20bf10093bdbc3f97e;p=linux-edison.git

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] 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.
---

da104a83692cf07434ab3b20bf10093bdbc3f97e