]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit86eab753c6665b7b2a99923c33466bedff199045
tree0c3d8a25acd4b34f0d460bd9ef6173f72ec2ade2
parentf1bdef9dcbabea436c713cd627941a1ae893aeb9
parent9ac3af147cc54c0d27a3ac5425cf538bafd7cb8d
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>