tree 7949f52a5ca0c7fa74ec8e49ba89a00d0e4114a9
parent 726ce0656b99ac6436b590d83613fe8447b4769e
parent 155d109b5f52ffd749219b27702462dcd9cf4f8d
author Linus Torvalds <torvalds@linux-foundation.org> 1308930155 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308930155 -0700

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