Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[sfrench/cifs-2.6.git] / Documentation / ioctl-number.txt

diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 3de7d379cf077d3c933c931133b5f17132d1fa3a..240ce7a56c40c9edfd141468ef2f2f1cf40dfab5 100644 (file)
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -67,7 +67,7 @@ Code  Seq#    Include File            Comments
 0x00   00-1F   linux/wavefront.h       conflict!
 0x02   all     linux/fd.h
 0x03   all     linux/hdreg.h
-0x04   all     linux/umsdos_fs.h
+0x04   D2-DC   linux/umsdos_fs.h       Dead since 2.6.11, but don't reuse these.
 0x06   all     linux/lp.h
 0x09   all     linux/md.h
 0x12   all     linux/fs.h
@@ -138,6 +138,7 @@ Code        Seq#    Include File            Comments
 'm'    00-1F   net/irda/irmod.h        conflict!
 'n'    00-7F   linux/ncp_fs.h
 'n'    E0-FF   video/matrox.h          matroxfb
+'o'    00-1F   fs/ocfs2/ocfs2_fs.h     OCFS2
 'p'    00-0F   linux/phantom.h         conflict! (OpenHaptics needs this)
 'p'    00-3F   linux/mc146818rtc.h     conflict!
 'p'    40-7F   linux/nvram.h
@@ -182,6 +183,8 @@ Code        Seq#    Include File            Comments
 0xAC   00-1F   linux/raw.h
 0xAD   00      Netfilter device        in development:
                                        <mailto:rusty@rustcorp.com.au>  
+0xAE   all     linux/kvm.h             Kernel-based Virtual Machine
+                                       <mailto:kvm-devel@lists.sourceforge.net>
 0xB0   all     RATIO devices           in development:
                                        <mailto:vgo@ratio.de>
 0xB1   00-1F   PPPoX                   <mailto:mostrows@styx.uwaterloo.ca>