Merge branch 'for-4.5/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Mon, 1 Feb 2016 16:08:39 +0000 (09:08 -0700)
committerJens Axboe <axboe@fb.com>
Mon, 1 Feb 2016 16:08:39 +0000 (09:08 -0700)
commit90b90d06db0be30aeb89b6b4ab618d644211a85e
tree97e673be1eef40cdc6912d6ce9c44d17cbc747b3
parented0ae43c9d5312932e1706e66506b2ba97fa7c93
parenta0c80efe5956ccce9fe7ae5c78542578c07bc20a
Merge branch 'for-4.5/for-jens' of git://git./linux/kernel/git/jikos/linux-block into for-linus

Locking fix from Jiri
drivers/block/floppy.c