From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Oct 2015 22:22:15 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: firefly_0821_release~176^2~873
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3d0aa366072a194c6a339d37b85d5b99e936097e;p=firefly-linux-kernel-4.4.55.git

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

Pull blkcg fix from Jens Axboe:
 "One final fix that should go into 4.3.  It's a simple 2x1 liner,
  fixing a blkcg accounting issue.  It was using the wrong bio member to
  look at the sync and write bits..."

* 'for-linus' of git://git.kernel.dk/linux-block:
  blkcg: fix incorrect read/write sync/async stat accounting
---

3d0aa366072a194c6a339d37b85d5b99e936097e