Merge branch 'for-4.12/block' into for-next
authorJens Axboe <axboe@fb.com>
Fri, 7 Apr 2017 18:46:11 +0000 (12:46 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 7 Apr 2017 18:46:11 +0000 (12:46 -0600)
commitba127856d458a4ab4dd32ac8a59f2673b194db99
treebef9cdafc6fa90cca4e0a3b426c9c0e553197bfa
parent977c637bdf133311ef887c12fa3ed8b3e5a4210b
parent710c785f80ace49049aef1a003c0b8b932a58af8
Merge branch 'for-4.12/block' into for-next
drivers/scsi/sg.c