diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-11 16:31:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-11 16:31:59 +0200 |
| commit | 01fd817694b3fe580504279cafe6befd4bd24eb8 (patch) | |
| tree | ffcb6b6a4a5c495e84992d324c5d9e8f40358ca3 /Documentation | |
| parent | f334a8a7e489ca9348f5d1b35bc94f778f5ada3e (diff) | |
| parent | 83f19150242ee57730a4331b6ae9a9b90ccc718c (diff) | |
Merge branch 'perfcounters/urgent' into auto-latest
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 7bb0d934b6d8..dbea4f95fc85 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -139,6 +139,7 @@ Code Seq# Include File Comments 'm' all linux/synclink.h conflict! 'm' 00-1F net/irda/irmod.h conflict! 'n' 00-7F linux/ncp_fs.h +'n' 80-8F linux/nilfs2_fs.h NILFS2 'n' E0-FF video/matrox.h matroxfb 'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) |