diff options
| author | Ingo Molnar <[email protected]> | 2017-01-31 07:38:17 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-01-31 07:38:17 +0000 |
| commit | f26483eaedec39b09b1f2bdfc3f0d18f86764327 (patch) | |
| tree | 4d5b94adb85d84517462d4883c59cbf3af5dd116 /net/unix/af_unix.c | |
| parent | x86/microcode/AMD: Remove struct cont_desc.eq_id (diff) | |
| parent | x86/microcode: Do not access the initrd after it has been freed (diff) | |
| download | kernel-f26483eaedec39b09b1f2bdfc3f0d18f86764327.tar.gz kernel-f26483eaedec39b09b1f2bdfc3f0d18f86764327.zip | |
Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/microcode/amd.c
arch/x86/kernel/cpu/microcode/core.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions