Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorTejun Heo <tj@kernel.org>
Tue, 13 May 2014 15:30:04 +0000 (11:30 -0400)
committerTejun Heo <tj@kernel.org>
Tue, 13 May 2014 15:30:04 +0000 (11:30 -0400)
commitf21a4f7594a122dcaabc08ce03bfb63fdc34de1b
treebdce189dc55f875e5466c31374c52b48f4ba4db0
parentd39ea871c3c1269e2852ea096fff492ea034df8a
parent36e9d2ebcc15d029b33f42a36146ab5a5bcfcfe7
Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/cgroup into for-3.16

Pull to receive e37a06f10994 ("cgroup: fix the retry path of
cgroup_mount()") to avoid unnecessary conflicts with planned
cgroup_tree_mutex removal and also to be able to remove the temp fix
added by 36c38fb7144a ("blkcg: use trylock on blkcg_pol_mutex in
blkcg_reset_stats()") afterwards.

Signed-off-by: Tejun Heo <tj@kernel.org>
include/linux/cgroup.h
kernel/cgroup.c