diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-29 16:33:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-29 16:33:37 -0800 |
commit | 1cac8e884fbea0b10ee5692cd97e456b58c34ce5 (patch) | |
tree | ae6417c9015085e275caa84f755ee6f3a54d234e /fs/ioprio.c | |
parent | b0365c8d0cb6e79eb5f21418ae61ab511f31b575 (diff) | |
parent | f2b20d436534f22ccc3f5ad172499fcb013bb315 (diff) | |
download | blackbird-op-linux-1cac8e884fbea0b10ee5692cd97e456b58c34ce5.tar.gz blackbird-op-linux-1cac8e884fbea0b10ee5692cd97e456b58c34ce5.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix blk_queue_end_tag()
block: re-use existing 'reading' variable instead of checking direction again
block, cfq: fix empty queue crash caused by request merge
Diffstat (limited to 'fs/ioprio.c')
0 files changed, 0 insertions, 0 deletions