| commit | 73aa86825f45cf8efccf20128779416db7c278b2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 20 09:48:52 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 20 09:48:52 2011 -0700 |
| tree | fbffdf48afeda5ad45c23e6d7c132ae4a040f080 | |
| parent | 2f666bcf757cb72549f360ef6da02f03620a48b6 [diff] | |
| parent | 60735b6362f29b52b5635a2dfa9ab5ad39948345 [diff] |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: Remove the extra check in queue_requests_store block, blk-sysfs: Fix an err return path in blk_register_queue() block: remove stale kerneldoc member from __blk_run_queue() block: get rid of QUEUE_FLAG_REENTER cfq-iosched: read_lock() does not always imply rcu_read_lock() block: kill blk_flush_plug_list() export