diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-05 09:52:40 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-05 09:52:40 +0200 |
commit | 5168f091cff266baf40efe58247fa7303c392c75 (patch) | |
tree | 9b27228bf6aed31ac68c311e5c8bf99bbae97187 /Documentation/ioctl-number.txt | |
parent | 9f24b3ed3058f022dad24f8304b9ad53adf5aa71 (diff) | |
parent | 2165f631f0e1d4e9a1ee425ef05cb727352285e0 (diff) |
Merge branch 'linus' into kmemcheck
Diffstat (limited to 'Documentation/ioctl-number.txt')
-rw-r--r-- | Documentation/ioctl-number.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 3bb5f466a90d..1c6b545635a2 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt @@ -105,7 +105,6 @@ Code Seq# Include File Comments 'T' all linux/soundcard.h conflict! 'T' all asm-i386/ioctls.h conflict! 'U' 00-EF linux/drivers/usb/usb.h -'U' F0-FF drivers/usb/auerswald.c 'V' all linux/vt.h 'W' 00-1F linux/watchdog.h conflict! 'W' 00-1F linux/wanrouter.h conflict! |