From: Tejun Heo <tj@kernel.org>
Date: Fri, 7 Mar 2014 15:23:57 +0000 (-0500)
Subject: Merge branch 'master' into wq/for-3.15
X-Git-Tag: firefly_0821_release~176^2~4216^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5078585a18c8cb7d1b6b7744fce842dadb3b7c72;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' into wq/for-3.15

Pull 3.14-rc5 into wq/for-3.15 to receive nvme updates which the
scheduled PREPARE_DELAYED_WORK() updates depend on.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

5078585a18c8cb7d1b6b7744fce842dadb3b7c72