]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'linus' into locking/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 30 Sep 2016 08:54:46 +0000 (10:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 30 Sep 2016 08:54:46 +0000 (10:54 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/cgroup.c

diff --cc kernel/cgroup.c
Simple merge