]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'smp/hotplug'
authorIngo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:37 +0000 (08:45 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:37 +0000 (08:45 +0100)
1  2 
kernel/cpu.c

diff --cc kernel/cpu.c
Simple merge