Merge branch 'for-4.11/block' into for-next
authorJens Axboe <axboe@fb.com>
Mon, 13 Feb 2017 22:43:37 +0000 (15:43 -0700)
committerJens Axboe <axboe@fb.com>
Mon, 13 Feb 2017 22:43:37 +0000 (15:43 -0700)
commit3370e831809a7e02e3179dd097566e8a71a87a29
tree2ce7d0797dbf5d8c0eb85aa7ba84c1d677b0e96d
parent53f39eeaa26385ad41ebea3dd6d7b2c14e98369a
parentc5c9b26ee5f1295c77d8f2ff5f804ed6c0b07cc4
Merge branch 'for-4.11/block' into for-next
drivers/block/cciss.c