]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.10-fixes' into for-next
authorTejun Heo <tj@kernel.org>
Fri, 24 May 2013 01:50:38 +0000 (10:50 +0900)
committerTejun Heo <tj@kernel.org>
Fri, 24 May 2013 01:50:38 +0000 (10:50 +0900)
1  2 
include/linux/cgroup.h
kernel/cgroup.c

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