Merge branch 'for-4.11/block' into for-next
authorJens Axboe <axboe@fb.com>
Tue, 7 Feb 2017 23:17:22 +0000 (16:17 -0700)
committerJens Axboe <axboe@fb.com>
Tue, 7 Feb 2017 23:17:22 +0000 (16:17 -0700)
commit2200d872cf1ddd0e3f6f5b1d7d2c91f05235d721
treed6903b1cdeb5d0246f5a50c2f1b3356fcd0af040
parentd8be8b7ee23a12c16b0738981f9d4940f6bc91e8
parent605cdf0875f80300be47e79bd91b2d60916407d3
Merge branch 'for-4.11/block' into for-next
drivers/cdrom/gdrom.c