]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...
authorJens Axboe <axboe@kernel.dk>
Tue, 31 Jul 2012 09:47:36 +0000 (11:47 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 31 Jul 2012 09:47:36 +0000 (11:47 +0200)
commit2ee1778506b0ca5beeb9d3ac124b234863f55135
treee3768640b2a002b45e07f5d8a8795d51c2f35652
parent4002cdfeee21d0f535bb0fdea37e02915329233c
parentedb8c9b6aa6e2a95c8aa606d1e6c780d9d497626
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers
drivers/block/floppy.c