From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 May 2014 02:22:57 +0000 (+0900)
Subject: Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v3.15-rc6~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26a41cd1eeac299d0d7c505f8d38976a553c8fc4;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
 "During recent restructuring, device_cgroup unified config input check
  and enforcement logic; unfortunately, it turned out to share too much.
  Aristeu's patches fix the breakage and marked for -stable backport.

  The other two patches are fallouts from kernfs conversion.  The blkcg
  change is temporary and will go away once kernfs internal locking gets
  simplified (patches pending)"

* 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  blkcg: use trylock on blkcg_pol_mutex in blkcg_reset_stats()
  device_cgroup: check if exception removal is allowed
  device_cgroup: fix the comment format for recently added functions
  device_cgroup: rework device access check and exception checking
  cgroup: fix the retry path of cgroup_mount()
---

26a41cd1eeac299d0d7c505f8d38976a553c8fc4