Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 May 2010 21:07:20 +0000 (14:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 May 2010 21:07:20 +0000 (14:07 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  blk-cgroup: Fix an RCU warning in blkiocg_create()
  blk-cgroup: Fix RCU correctness warning in cfq_init_queue()
  drbd: don't expose failed local READ to upper layers


Trivial merge