From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jun 2011 15:42:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.0-rc5~35
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5220cc9382e11ca955ce946ee6a5bac577bb14ff;p=~emulex%2Finfiniband.git

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

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: add REQ_SECURE to REQ_COMMON_MASK
  block: use the passed in @bdev when claiming if partno is zero
  block: Add __attribute__((format(printf...) and fix fallout
  block: make disk_block_events() properly wait for work cancellation
  block: remove non-syncing __disk_block_events() and fold it into disk_block_events()
  block: don't use non-syncing event blocking in disk_check_events()
  cfq-iosched: fix locking around ioc->ioc_data assignment
---

5220cc9382e11ca955ce946ee6a5bac577bb14ff