projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into xen-64bit
[linux-2.6-block.git]
/
Documentation
/
ioctl-number.txt
diff --git
a/Documentation/ioctl-number.txt
b/Documentation/ioctl-number.txt
index 240ce7a56c40c9edfd141468ef2f2f1cf40dfab5..3bb5f466a90db3e971b42fb26c60d716a30878ed 100644
(file)
--- a/
Documentation/ioctl-number.txt
+++ b/
Documentation/ioctl-number.txt
@@
-117,6
+117,7
@@
Code Seq# Include File Comments
<mailto:natalia@nikhefk.nikhef.nl>
'c' 00-7F linux/comstats.h conflict!
'c' 00-7F linux/coda.h conflict!
+'c' 80-9F asm-s390/chsc.h
'd' 00-FF linux/char/drm/drm/h conflict!
'd' 00-DF linux/video_decoder.h conflict!
'd' F0-FF linux/digi1.h