| commit | 6c869e772c72d509d0db243a56c205ef48a29baf | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Nov 26 15:07:02 2010 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Nov 26 15:07:02 2010 +0100 |
| tree | 9a290f1742526a8816f94560cb09bc0a09c910de | |
| parent | e4e91ac410356da3a518188f371e9d3b52ee38ee [diff] | |
| parent | ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556 [diff] |
Merge branch 'perf/urgent' into perf/core Conflicts: arch/x86/kernel/apic/hw_nmi.c Merge reason: Resolve conflict, queue up dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>