| commit | ca7e0c612005937a4a5a75d3fed90459993de65c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Apr 08 13:36:36 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Apr 08 13:37:18 2010 +0200 |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c [diff] | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f [diff] |
Merge branch 'linus' into perf/core Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c Merge reason: pick up latest fixes, fix the conflict Signed-off-by: Ingo Molnar <mingo@elte.hu>