diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 21:42:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 21:42:23 -0500 |
| commit | d27ba47e7e8c466c18983a1779d611f82d6a354f (patch) | |
| tree | 2870d82516be16e0cae63e1f7e84bd855bb34a23 /Documentation | |
| parent | e3d8b77bc7a89d190ee895d0570af10c026e5086 (diff) | |
| parent | dd3e2dcf3408843ed35501c28626f389b30be756 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ioctl-number.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 769f925c8526..87f4d052e39c 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt | |||
| @@ -130,8 +130,6 @@ Code Seq# Include File Comments | |||
| 130 | <mailto:zapman@interlan.net> | 130 | <mailto:zapman@interlan.net> |
| 131 | 'i' 00-3F linux/i2o.h | 131 | 'i' 00-3F linux/i2o.h |
| 132 | 'j' 00-3F linux/joystick.h | 132 | 'j' 00-3F linux/joystick.h |
| 133 | 'k' all asm-sparc/kbio.h | ||
| 134 | asm-sparc64/kbio.h | ||
| 135 | 'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system | 133 | 'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system |
| 136 | <http://mikonos.dia.unisa.it/tcfs> | 134 | <http://mikonos.dia.unisa.it/tcfs> |
| 137 | 'l' 40-7F linux/udf_fs_i.h in development: | 135 | 'l' 40-7F linux/udf_fs_i.h in development: |