| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Jul 28 23:32:00 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Jul 28 23:32:00 2008 +0200 |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a [diff] | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f [diff] |
Merge branch 'linus' into cpus4096 Conflicts: kernel/stop_machine.c Signed-off-by: Ingo Molnar <mingo@elte.hu>