| commit | ec5e61aabeac58670691bd0613388d16697d0d81 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Apr 02 19:37:50 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Apr 02 19:38:10 2010 +0200 |
| tree | 59838509358f27334874b90756505785cde29b02 | |
| parent | 75ec5a245c7763c397f31ec8964d0a46c54a7386 [diff] | |
| parent | 8bb39f9aa068262732fe44b965d7a6eb5a5a7d67 [diff] |
Merge branch 'perf/urgent' into perf/core Conflicts: arch/x86/kernel/cpu/perf_event.c Merge reason: Resolve the conflict, pick up fixes Signed-off-by: Ingo Molnar <mingo@elte.hu>