summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-cd_ioctl.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-04-21 20:48:20 (GMT)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-04-21 20:48:20 (GMT)
commitdcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f (patch)
tree1a9644ce5c167972febc5134f13d554504d11af5 /drivers/ide/ide-cd_ioctl.c
parent5c1458478c49b905652fc002708d09369763f58f (diff)
parent3b5f668e715bc19610ad967ef97a7e8c55a186ec (diff)
parent5dffed1e5721f6deae4fd67d32386ef037c5fc56 (diff)
parenta54062c0d95921d4fb0edc8d268021bf387e6c75 (diff)
downloadlinux-dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f.tar.xz
Merge branches 'doc.2016.04.19a', 'exp.2016.03.31d', 'fixes.2016.03.31d' and 'torture.2016.04.21a' into HEAD
doc.2016.04.19a: Documentation updates exp.2016.03.31d: Expedited grace-period updates fixes.2016.03.31d: Miscellaneous fixes torture.2016.004.21a Torture-test updates