From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Sep 2011 20:20:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: firefly_0821_release~3680^2~4430
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fed678dc8a8b839c8189b5d889a94e865cd327dd;p=firefly-linux-kernel-4.4.55.git

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.
---

fed678dc8a8b839c8189b5d889a94e865cd327dd