| commit | 1cac8e884fbea0b10ee5692cd97e456b58c34ce5 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 30 Dec 2011 00:33:37 +0000 (29 16:33 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 30 Dec 2011 00:33:37 +0000 (29 16:33 -0800) | ||
| tree | ae6417c9015085e275caa84f755ee6f3a54d234e | treesnapshot (tar.gz zip) |
| parent | b0365c8d0cb6e79eb5f21418ae61ab511f31b575 | commitdiff |
| parent | f2b20d436534f22ccc3f5ad172499fcb013bb315 | commitdiff |
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
* '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