diff options
| author | Ingo Molnar <[email protected]> | 2016-11-23 07:18:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-11-23 07:18:09 +0100 |
| commit | 064e6a8ba61a751625478f656c6f76a6f37a009e (patch) | |
| tree | a22d84d037543f74b6c86969c7e87ab799768de9 /arch/x86/include/asm/fpu/internal.h | |
| parent | af25ed59b5616b389d90877f7085dc5d457a3d49 (diff) | |
| parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
Merge branch 'linus' into x86/fpu, to resolve conflicts
Conflicts:
arch/x86/kernel/fpu/core.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/x86/include/asm/fpu/internal.h')
0 files changed, 0 insertions, 0 deletions