From: Tejun Heo <tj@kernel.org>
Date: Tue, 13 May 2014 15:30:04 +0000 (-0400)
Subject: Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f21a4f7594a122dcaabc08ce03bfb63fdc34de1b;p=openwrt%2Fstaging%2Fblogic.git

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>
---

f21a4f7594a122dcaabc08ce03bfb63fdc34de1b