Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Fri, 29 Dec 2006 18:07:18 +0000 (10:07 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 29 Dec 2006 18:07:18 +0000 (10:07 -0800)
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: fix stsch_reset.
  [S390] Change max. buffer size for monwriter device.


Trivial merge