From: Linus Torvalds Date: Tue, 7 Apr 2009 18:06:41 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6a5d263866d699ebf6843105497afc86ee53de5b;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: loop: mutex already unlocked in loop_clr_fd() cfq-iosched: don't let idling interfere with plugging block: remove unused REQ_UNPLUG cfq-iosched: kill two unused cfqq flags cfq-iosched: change dispatch logic to deal with single requests at the time mflash: initial support cciss: change to discover first memory BAR cciss: kernel scan thread for MSA2012 cciss: fix residual count for block pc requests block: fix inconsistency in I/O stat accounting code block: elevator quiescing helpers --- 6a5d263866d699ebf6843105497afc86ee53de5b