diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
| commit | 02e2407858fd62053bf60349c0e72cd1c7a4a60e (patch) | |
| tree | 0ebdbddc97d3abbc675916010e7771065b70c137 /Documentation/ioctl/ioctl-number.txt | |
| parent | 96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9 (diff) | |
| parent | 6447f55da90b77faec1697d499ed7986bb4f6de6 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 ac293e955308..e68543f767d5 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
| @@ -133,6 +133,7 @@ Code Seq#(hex) Include File Comments | |||
| 133 | 'H' C0-DF net/bluetooth/hidp/hidp.h conflict! | 133 | 'H' C0-DF net/bluetooth/hidp/hidp.h conflict! |
| 134 | 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! | 134 | 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! |
| 135 | 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! | 135 | 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! |
| 136 | 'H' F1 linux/hid-roccat.h <mailto:erazor_de@users.sourceforge.net> | ||
| 136 | 'I' all linux/isdn.h conflict! | 137 | 'I' all linux/isdn.h conflict! |
| 137 | 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! | 138 | 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! |
| 138 | 'I' 40-4F linux/mISDNif.h conflict! | 139 | 'I' 40-4F linux/mISDNif.h conflict! |