diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-07-04 10:36:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-07-04 10:36:20 +0200 |
| commit | f584dd32edc5d4400d7ceb92111a89f0c1f6651f (patch) | |
| tree | e31ee9615fc9f07e8791fca0e77cd35f2dd1041a /arch/arm/mach-omap2/wd_timer.c | |
| parent | Merge tag 'perf-core-for-mingo-5.3-20190703' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | x86/fsgsbase: Revert FSGSBASE support (diff) | |
| download | linux-f584dd32edc5d4400d7ceb92111a89f0c1f6651f.tar.xz linux-f584dd32edc5d4400d7ceb92111a89f0c1f6651f.zip | |
Merge branch 'x86/cpu' into perf/core, to pick up revert
perf/core has an earlier version of the x86/cpu tree merged, to avoid
conflicts, and due to this we want to pick up this ABI impacting
revert as well:
049331f277fe: ("x86/fsgsbase: Revert FSGSBASE support")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-omap2/wd_timer.c')
0 files changed, 0 insertions, 0 deletions