summaryrefslogtreecommitdiff
path: root/Documentation/ioctl/cdrom.txt
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-05-24 09:30:15 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-05-24 09:30:15 -0700
commit754451342fc5954061ede74b0a8485ec4a4c6eaa (patch)
tree82daccba5779de492631c42e47a614bd9d4cddd2 /Documentation/ioctl/cdrom.txt
parentbf232e460a3530adf17da7d7f1332347b73a3d08 (diff)
parent771c577c23bac90597c685971d7297ea00f99d11 (diff)
Merge tag 'v4.17-rc6' into next
Sync up with mainline to bring in Atmel controller changes for Caroline.
Diffstat (limited to 'Documentation/ioctl/cdrom.txt')
0 files changed, 0 insertions, 0 deletions