diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-29 13:07:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-29 13:07:18 -0500 |
| commit | 7479b1ce5ea41a828002c60739cff37f47b62913 (patch) | |
| tree | a8af71f221374dfbf5d72c323e69ee2a2493db84 /include/asm-ppc/traps.h | |
| parent | 4945b8a553ec735f416596cbf5789c439d16fb38 (diff) | |
| parent | aa77015c4e94cb1d30680646c163d7ae1f93f941 (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] cio: fix stsch_reset.
[S390] Change max. buffer size for monwriter device.
Diffstat (limited to 'include/asm-ppc/traps.h')
0 files changed, 0 insertions, 0 deletions