From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Feb 2010 20:54:37 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1a45dcfe2525e9432cb4aba461d4994fc2befe42;p=openwrt%2Fstaging%2Fblogic.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:
  cfq-iosched: Do not idle on async queues
  blk-cgroup: Fix potential deadlock in blk-cgroup
  block: fix bugs in bio-integrity mempool usage
  block: fix bio_add_page for non trivial merge_bvec_fn case
  drbd: null dereference bug
  drbd: fix max_segment_size initialization
---

1a45dcfe2525e9432cb4aba461d4994fc2befe42