diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:12:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:12:11 +0200 |
| commit | b0338e99b2a775c157e3e795f49fdcfb6c257f7a (patch) | |
| tree | 59573cd20718ebb5145b05938ef3fb428bde65c7 /fs/binfmt_som.c | |
| parent | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (diff) | |
| parent | 715c85b1fc824e9cd0ea07d6ceb80d2262f32e90 (diff) | |
| download | op-kernel-dev-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.zip op-kernel-dev-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.tar.gz | |
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>
Diffstat (limited to 'fs/binfmt_som.c')
0 files changed, 0 insertions, 0 deletions
