Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux...
authorJens Axboe <axboe@fb.com>
Wed, 18 Jun 2014 17:30:22 +0000 (10:30 -0700)
committerJens Axboe <axboe@fb.com>
Wed, 18 Jun 2014 17:30:22 +0000 (10:30 -0700)
commite64d4687730cf47bd0c59e9ed76b52ca0c0f44c0
treea57f523e749e6aa427a42974734cadabafd60b7b
parent86fb5c56cfa26de5e91c9a50e2767a695dff366e
parent1c65df3d7b1b311a73f5636a4ad6611f067baf1e
Merge branch 'for-jens' of git://git./linux/kernel/git/jikos/linux-block into for-linus
drivers/block/floppy.c