]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'for-3.10-fixes' into for-3.11
authorTejun Heo <tj@kernel.org>
Fri, 24 May 2013 01:53:09 +0000 (10:53 +0900)
committerTejun Heo <tj@kernel.org>
Fri, 24 May 2013 01:53:09 +0000 (10:53 +0900)
Merging to receive 7805d000db ("cgroup: fix a subtle bug in descendant
pre-order walk") so that further iterator updates can build upon it.

Signed-off-by: Tejun Heo <tj@kernel.org>
1  2 
include/linux/cgroup.h
kernel/cgroup.c

Simple merge
diff --cc kernel/cgroup.c
Simple merge