projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7104ce9 c3bebc7)
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)
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>

Trivial merge