Merge branch 'master' into wq/for-3.15
authorTejun Heo <tj@kernel.org>
Fri, 7 Mar 2014 15:23:57 +0000 (10:23 -0500)
committerTejun Heo <tj@kernel.org>
Fri, 7 Mar 2014 15:23:57 +0000 (10:23 -0500)
commit5078585a18c8cb7d1b6b7744fce842dadb3b7c72
tree0c3d8a25acd4b34f0d460bd9ef6173f72ec2ade2
parent7104ce9b349e0b0c9a71ee25efeb007057029677
parentc3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0
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>