Merge branch 'for-4.11/block' into for-next
authorJens Axboe <axboe@fb.com>
Tue, 14 Feb 2017 15:30:02 +0000 (08:30 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 14 Feb 2017 15:30:02 +0000 (08:30 -0700)
commitfb2a77e4a25ef63ff5b51b3bd53027077b402b0d
treeeda79fa2380cfa6b440fb9eac9bf1bf6942951f8
parent175e1638ed40cd18660f848842dfcaf74cfc8f2c
parent853fe1bf7554155376bb3b231112cdff9ff79177
Merge branch 'for-4.11/block' into for-next
drivers/cdrom/cdrom.c
drivers/cdrom/gdrom.c
drivers/ide/ide-cd.c
drivers/scsi/sr.c