]> git.proxmox.com Git - mirror_ubuntu-disco-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)
commit10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be
treee3768640b2a002b45e07f5d8a8795d51c2f35652
parent74018dc3063a2c729fc73041c0a9f03aac995920
parent2fb2ca6f5b953192d5a94fcc778d9abba06462df
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers
drivers/block/floppy.c