| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Mon, 28 Jul 2008 21:32:00 +0000 (28 23:32 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Mon, 28 Jul 2008 21:32:00 +0000 (28 23:32 +0200) | ||
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 | treesnapshot (tar.gz zip) |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a | commitdiff |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f | commitdiff |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| kernel/cpu.c | diff1 | diff2 | blobhistory |