Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2010 20:54:37 +0000 (12:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2010 20:54:37 +0000 (12:54 -0800)
* '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


Trivial merge