| commit | 064e6a8ba61a751625478f656c6f76a6f37a009e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Nov 23 07:18:09 2016 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Nov 23 07:18:09 2016 +0100 |
| tree | a22d84d037543f74b6c86969c7e87ab799768de9 | |
| 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 <mingo@kernel.org>