diff options
author | James Morris <jmorris@namei.org> | 2010-03-31 08:39:27 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-31 08:39:27 +1100 |
commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
tree | 7362b182dedd825fc762ef7706830837e42943af /Documentation/ioctl/ioctl-number.txt | |
parent | TPM: workaround to enforce PCR updates across suspends (diff) | |
parent | Linux 2.6.34-rc3 (diff) | |
download | linux-dev-d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec.tar.xz linux-dev-d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec.zip |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/ioctl/ioctl-number.txt')
-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 35c9b51d20ea..dd5806f4fcc4 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -291,6 +291,7 @@ Code Seq#(hex) Include File Comments 0x92 00-0F drivers/usb/mon/mon_bin.c 0x93 60-7F linux/auto_fs.h 0x94 all fs/btrfs/ioctl.h +0x97 00-7F fs/ceph/ioctl.h Ceph file system 0x99 00-0F 537-Addinboard driver <mailto:buk@buks.ipn.de> 0xA0 all linux/sdp/sdp.h Industrial Device Project |