diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-05-20 11:59:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-20 12:01:01 +0200 |
| commit | 6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b (patch) | |
| tree | 923d044c9cb5e3e89fdf02af35acc050e4f39195 /scripts | |
| parent | x86/fpu/init: Clean up and comment the __setup() functions (diff) | |
| parent | x86/fpu: Disable XSAVES* support for now (diff) | |
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
Conflicts:
arch/x86/kernel/i387.c
This commit is conflicting:
e88221c50cad ("x86/fpu: Disable XSAVES* support for now")
These functions changed a lot, move the quirk to arch/x86/kernel/fpu/init.c's
fpu__init_system_xstate_size_legacy().
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions