summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-07-31 11:47:36 +0200
committerJens Axboe <axboe@kernel.dk>2012-07-31 11:47:36 +0200
commit10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be (patch)
treee3768640b2a002b45e07f5d8a8795d51c2f35652 /block
parentblk: pass from_schedule to non-request unplug functions. (diff)
parentfloppy: remove duplicated flag FD_RAW_NEED_DISK (diff)
downloadlinux-10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be.tar.xz
linux-10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be.zip
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions