tree d2bf10d2a4e4ca0a27ccd6f7ae40e8e259acfcfc
parent 808bf29b9195c52239b9aaeda7c6082a0ddf07c6
parent 6c4867f6469964e34c5f4ee229a2a7f71a34c7ff
author Linus Torvalds <torvalds@linux-foundation.org> 1316636421 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316636421 -0700

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

* 'for-linus' of git://git.kernel.dk/linux-block:
  floppy: use del_timer_sync() in init cleanup
  blk-cgroup: be able to remove the record of unplugged device
  block: Don't check QUEUE_FLAG_SAME_COMP in __blk_complete_request
  mm: Add comment explaining task state setting in bdi_forker_thread()
  mm: Cleanup clearing of BDI_pending bit in bdi_forker_thread()
  block: simplify force plug flush code a little bit
  block: change force plug flush call order
  block: Fix queue_flag update when rq_affinity goes from 2 to 1
  block: separate priority boosting from REQ_META
  block: remove READ_META and WRITE_META
  xen-blkback: fixed indentation and comments
  xen-blkback: Don't disconnect backend until state switched to XenbusStateClosed.