tree fd8685dd17dcef45993b733f4ec4df97e6808304
parent d0de4dc584ec6aa3b26fffea320a8457827768fc
parent 782b86e2656762382ae1c2686d8d5c91f7d5eacf
author Linus Torvalds <torvalds@linux-foundation.org> 1302042541 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302042541 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block:
  ide: always ensure that blk_delay_queue() is called if we have pending IO
  block: fix request sorting at unplug
  dm: improve block integrity support
  fs: export empty_aops
  ide: ide_requeue_and_plug() reinstate "always plug" behaviour
  blk-throttle: don't call xchg on bool
  ufs: remove unessecary blk_flush_plug
  block: make the flush insertion use the tail of the dispatch list
  block: get rid of elv_insert() interface
  block: dump request state on seeing a corrupted request completion