]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23958e7 7805d00)
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 patch | diff1 | diff2 | blob | history
kernel/cgroup.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/cgroup.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.