| commit | b0338e99b2a775c157e3e795f49fdcfb6c257f7a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu Jul 05 21:12:11 2012 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu Jul 05 21:12:11 2012 +0200 |
| tree | 59573cd20718ebb5145b05938ef3fb428bde65c7 | |
| parent | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a [diff] | |
| parent | 715c85b1fc824e9cd0ea07d6ceb80d2262f32e90 [diff] |
Merge branch 'x86/cpu' into perf/core Merge this branch because we changed the wrmsr*_safe() API and there's a conflict. Signed-off-by: Ingo Molnar <mingo@kernel.org>