diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-21 08:57:33 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-21 08:57:33 (GMT) |
| commit | 73e21ce28d8d2b75140b742b01373c3a085ecc52 (patch) | |
| tree | add380154271f9a68be4099590f912b4ab4bed9f /include/linux/getcpu.h | |
| parent | b5210b2a34bae35fc00675462333af45676d727c (diff) | |
| parent | f1923820c447e986a9da0fc6bf60c1dccdf0408e (diff) | |
| download | linux-fsl-qoriq-73e21ce28d8d2b75140b742b01373c3a085ecc52.tar.xz | |
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>
Diffstat (limited to 'include/linux/getcpu.h')
0 files changed, 0 insertions, 0 deletions