From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jul 2011 20:22:26 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2a9d6df425d7b46b23cbc8673b2dfefa4678abdb;p=~shefty%2Frdma-dev.git

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

* 'for-linus' of git://git.kernel.dk/linux-block:
  drbd: we should write meta data updates with FLUSH FUA
  drbd: fix limit define, we support 1 PiByte now
  drbd: when receive times out on meta socket, also check last receive time on data socket
  drbd: account bitmap IO during resync as resync-(related-)-io
  drbd: don't cond_resched_lock with IRQs disabled
  drbd: add missing spinlock to bitmap receive
  drbd: Use the correct max_bio_size when creating resync requests
  cfq-iosched: make code consistent
  cfq-iosched: fix a rcu warning
---

2a9d6df425d7b46b23cbc8673b2dfefa4678abdb