From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 May 2010 21:07:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.34-rc7~5
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=48fe37cb53a40e13c2f9fc974f574e38d18be303;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* '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
---

48fe37cb53a40e13c2f9fc974f574e38d18be303