| commit | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Aug 05 08:45:05 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Aug 05 08:45:05 2010 +0200 |
| tree | 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c | |
| parent | 12a81c8df13c60904febcafcf6b90ca1acb67122 [diff] | |
| parent | eb703f98191a505f78d0066712ad67d5dedc4c90 [diff] |
Merge branch 'perf/nmi' into perf/core Conflicts: kernel/Makefile Merge reason: Add the now complete topic, fix the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>