diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-05 11:27:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-05 11:27:23 +0200 |
commit | bce6824cc8e86619901265b7e77c59cc9d99e05b (patch) | |
tree | ad118914e1374c2ccd06999bc24bd2708897ff7f /arch/x86/events/Kconfig | |
parent | 494b5168f2de009eb80f198f668da374295098dd (diff) | |
parent | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (diff) |
Merge branch 'x86/core' into x86/build, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/Kconfig')
0 files changed, 0 insertions, 0 deletions