From: Linus Torvalds Date: Fri, 30 Dec 2011 00:33:37 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block X-Git-Tag: v3.2~27 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1cac8e884fbea0b10ee5692cd97e456b58c34ce5;p=users%2Fhch%2Fmisc.git 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 --- 1cac8e884fbea0b10ee5692cd97e456b58c34ce5