diff options
| author | Ingo Molnar <[email protected]> | 2016-11-23 06:18:09 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-11-23 06:18:09 +0000 |
| commit | 064e6a8ba61a751625478f656c6f76a6f37a009e (patch) | |
| tree | a22d84d037543f74b6c86969c7e87ab799768de9 /drivers/net/xen-netback/interface.c | |
| parent | x86/fpu: Remove clts() (diff) | |
| parent | Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang... (diff) | |
| download | kernel-064e6a8ba61a751625478f656c6f76a6f37a009e.tar.gz kernel-064e6a8ba61a751625478f656c6f76a6f37a009e.zip | |
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 'drivers/net/xen-netback/interface.c')
0 files changed, 0 insertions, 0 deletions