]> 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)
commit16b50bc3c0adc51ccfe7251404c9d9fa30afceec
treee3768640b2a002b45e07f5d8a8795d51c2f35652
parent4c2d2613b519c3e7d309aaf2bcc974de3ccb0a54
parente7a41be27a8ab2693f362a77e0dc938e5256aa83
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers
drivers/block/floppy.c