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 /include/linux/v4l2-subdev.h | |
| parent | Merge branch 'perf/urgent' into perf/core (diff) | |
| parent | x86, cpu: Rename checking_wrmsrl() to wrmsrl_safe() (diff) | |
| download | wireguard-linux-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.tar.xz wireguard-linux-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.zip | |
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 'include/linux/v4l2-subdev.h')
0 files changed, 0 insertions, 0 deletions