diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:13:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:13:57 +0200 |
| commit | 1070505d18534076bda8ca13b1bc1ab2e09546da (patch) | |
| tree | 07a857a72739d0d7719a8b04948aa2024f51790d /arch/x86/include/asm/perf_event.h | |
| parent | b0338e99b2a775c157e3e795f49fdcfb6c257f7a (diff) | |
| parent | 3d8986bc7f309483ee09c7a02888bab09072c19b (diff) | |
Merge branch 'x86/microcode' into perf/core
Merge this branch because we want to rely on the newer (and saner)
microcode loading and checking facilities.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/perf_event.h')
0 files changed, 0 insertions, 0 deletions