Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / Documentation / ioctl / cdrom.txt

diff --git a/Documentation/ioctl/cdrom.txt b/Documentation/ioctl/cdrom.txt
index 59df81c8da2b86dd71394ccb85ab34bc1cba4595..a4d62a9d677120bf16903aa1d046c1d55f8faef5 100644 (file)
--- a/Documentation/ioctl/cdrom.txt
+++ b/Documentation/ioctl/cdrom.txt
@@ -340,7 +340,8 @@ CDROMSUBCHNL                        Read subchannel data (struct cdrom_subchnl)
          EINVAL        format not CDROM_MSF or CDROM_LBA
 
        notes:
-         Format is converted to CDROM_MSF on return
+         Format is converted to CDROM_MSF or CDROM_LBA
+         as per user request on return