Merge branch 'linus' into cpus4096
commit9e3ee1c39c0cc71222f9980ccbf87fe072897eef
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000 (28 23:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000 (28 23:32 +0200)
tree99462000e6f0d4f907cb2fc690f19d4d441ba0f3
parente56b3bc7942982ac2589c942fb345e38bc7a341a
parentf934fb19ef34730263e6afc01e8ec27a8a71470f
Merge branch 'linus' into cpus4096

Conflicts:

kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/cpu.c