]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12' into for-next
authorTejun Heo <tj@kernel.org>
Wed, 14 Aug 2013 00:23:30 +0000 (20:23 -0400)
committerTejun Heo <tj@kernel.org>
Wed, 14 Aug 2013 00:23:30 +0000 (20:23 -0400)
1  2 
kernel/cpuset.c

diff --cc kernel/cpuset.c
Simple merge