aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/omap54xx.h
diff options
context:
space:
mode:
authorLinus Torvalds2014-04-07 15:20:10 -0700
committerLinus Torvalds2014-04-07 15:20:10 -0700
commitdc5ed40686a4da95881c35d913b60f867755cbe2 (patch)
tree8553406baccf981cdc3b6251dd3c7e89de2fc4ca /arch/arm/mach-omap2/omap54xx.h
parent467a9e1633043810259a7f5368fbcc1e84746137 (diff)
parent49957f8e2a43035a97d05bddefa394492a969c0d (diff)
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo: "Two patches to fix fallouts from the kernfs conversion: Li's patch to stop leaking cgroup_root refs across multiple mounts and the other fixes the 90s hang during shutdown caused by always using root's uid/gid for new cgroup dirs and files." * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: newly created dirs and files should be owned by the creator cgroup: fix top cgroup refcnt leak
Diffstat (limited to 'arch/arm/mach-omap2/omap54xx.h')
0 files changed, 0 insertions, 0 deletions