| commit | 73e21ce28d8d2b75140b742b01373c3a085ecc52 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun Apr 21 10:57:33 2013 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun Apr 21 10:57:33 2013 +0200 |
| tree | add380154271f9a68be4099590f912b4ab4bed9f | |
| parent | b5210b2a34bae35fc00675462333af45676d727c [diff] | |
| parent | f1923820c447e986a9da0fc6bf60c1dccdf0408e [diff] |
Merge branch 'perf/urgent' into perf/core Conflicts: arch/x86/kernel/cpu/perf_event_intel.c Merge in the latest fixes before applying new patches, resolve the conflict. Signed-off-by: Ingo Molnar <mingo@kernel.org>