| commit | 13b2eda64d14d0a0c15c092664c7351ea58ea851 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Feb 26 06:30:42 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Feb 26 06:30:42 2009 +0100 |
| tree | e0c82eb79a20f515f37ab3ffb9e5039b531eaa8c | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 [diff] | |
| parent | 55d8085671863fe4ee6a17b7814bd38180a44e1d [diff] |
Merge branch 'x86/urgent' into x86/core Conflicts: arch/x86/mach-voyager/voyager_smp.c