Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi

[mirror_ubuntu-artful-kernel.git] / Documentation / ioctl / ioctl-number.txt

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index af76fdef6046302ec5ccaf25566e1269b240503a..e34b531dc3161a18cc55fc591bd1db0e7c6991dd 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -149,6 +149,7 @@ Code  Seq#(hex)     Include File            Comments
 'M'    01-03   drivers/scsi/megaraid/megaraid_sas.h
 'M'    00-0F   drivers/video/fsl-diu-fb.h      conflict!
 'N'    00-1F   drivers/usb/scanner.h
+'N'    40-7F   drivers/block/nvme.c
 'O'     00-06   mtd/ubi-user.h         UBI
 'P'    all     linux/soundcard.h       conflict!
 'P'    60-6F   sound/sscape_ioctl.h    conflict!
@@ -188,7 +189,7 @@ Code  Seq#(hex)     Include File            Comments
 'Y'    all     linux/cyclades.h
 'Z'    14-15   drivers/message/fusion/mptctl.h
 '['    00-07   linux/usb/tmc.h         USB Test and Measurement Devices
-                                       <mailto:gregkh@suse.de>
+                                       <mailto:gregkh@linuxfoundation.org>
 'a'    all     linux/atm*.h, linux/sonet.h     ATM on linux
                                        <http://lrcwww.epfl.ch/>
 'b'    00-FF                           conflict! bit3 vme host bridge
@@ -217,6 +218,7 @@ Code  Seq#(hex)     Include File            Comments
 'h'    00-7F                           conflict! Charon filesystem
                                        <mailto:zapman@interlan.net>
 'h'    00-1F   linux/hpet.h            conflict!
+'h'    80-8F   fs/hfsplus/ioctl.c
 'i'    00-3F   linux/i2o-dev.h         conflict!
 'i'    0B-1F   linux/ipmi.h            conflict!
 'i'    80-8F   linux/i8k.h
@@ -255,7 +257,7 @@ Code  Seq#(hex)     Include File            Comments
                linux/ixjuser.h         <http://web.archive.org/web/*/http://www.quicknet.net>
 'r'    00-1F   linux/msdos_fs.h and fs/fat/dir.c
 's'    all     linux/cdk.h
-'t'    00-7F   linux/if_ppp.h
+'t'    00-7F   linux/ppp-ioctl.h
 't'    80-8F   linux/isdn_ppp.h
 't'    90      linux/toshiba.h
 'u'    00-1F   linux/smb_fs.h          gone