tree 250063e9ed52596a8006a594ebf2efe84261cc7b
parent 6a5c75ce10cbfc805a4e6305638d6329a3beb77a
parent aa32362f011c6e863132b16c1761487166a4bad2
author Linus Torvalds <torvalds@linux-foundation.org> 1410146416 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1410146416 -0700

Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
 "This pull request includes Alban's patch to disallow '\n' in cgroup
  names.

  Two other patches from Li to fix a possible oops when cgroup
  destruction races against other file operations and one from Vivek to
  fix a unified hierarchy devel behavior"

* 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: check cgroup liveliness before unbreaking kernfs
  cgroup: delay the clearing of cgrp->kn->priv
  cgroup: Display legacy cgroup files on default hierarchy
  cgroup: reject cgroup names with '\n'