From b265c853ac9f2cdc87c5895b07ab6497f024653c Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 25 May 2006 12:47:04 -0400 Subject: [PATCH] --- yaml --- r: 38703 b: refs/heads/master c: e79664886ddd569afa1b198ca436a63aefc19073 h: refs/heads/master i: 38701: a23a445e192da24633e3ba401b5a2dd4fe4632f2 38699: 9b2fea95cde3828120be5ca29705da0714ecc1ba 38695: c96f426006631bbfd7cb2cdd9432b24fa5be45c9 38687: 3b7ea549915d54146c4861a816d8ed4de972ec12 v: v3 --- [refs] | 2 +- trunk/Documentation/ioctl-number.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dba11129ec86..a4e81077a0f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 +refs/heads/master: e79664886ddd569afa1b198ca436a63aefc19073 diff --git a/trunk/Documentation/ioctl-number.txt b/trunk/Documentation/ioctl-number.txt index 93a86ac23cdd..171a44ebd939 100644 --- a/trunk/Documentation/ioctl-number.txt +++ b/trunk/Documentation/ioctl-number.txt @@ -124,7 +124,6 @@ Code Seq# Include File Comments 'e' 00-1F linux/video_encoder.h conflict! 'e' 00-1F net/irda/irtty.h conflict! 'f' 00-1F linux/ext2_fs.h -'g' 00-1F linux/gfs2_ioctl.h 'h' 00-7F Charon filesystem 'i' 00-3F linux/i2o.h