]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:34:07 +0000 (11:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:34:07 +0000 (11:34 +1000)
1  2 
kernel/cpuset.c

diff --cc kernel/cpuset.c
Simple merge