diff options
author | Jens Axboe <axboe@kernel.dk> | 2012-07-31 11:47:36 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-07-31 11:47:36 +0200 |
commit | 10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be (patch) | |
tree | e3768640b2a002b45e07f5d8a8795d51c2f35652 /block | |
parent | blk: pass from_schedule to non-request unplug functions. (diff) | |
parent | floppy: remove duplicated flag FD_RAW_NEED_DISK (diff) | |
download | linux-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