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)
commit7479b1ce5ea41a828002c60739cff37f47b62913
treea8af71f221374dfbf5d72c323e69ee2a2493db84
parent4945b8a553ec735f416596cbf5789c439d16fb38
parentaa77015c4e94cb1d30680646c163d7ae1f93f941
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] cio: fix stsch_reset.
  [S390] Change max. buffer size for monwriter device.