diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2008-09-04 09:21:21 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 09:21:21 -0700 |
| commit | aa3341a168883654d1b13f5931c5ed2762537831 (patch) | |
| tree | 1394eb320916b4e5604761dbc8ae1a9bc1903602 /net/unix/af_unix.c | |
| parent | Merge branch 'linus' into x86/x2apic (diff) | |
| parent | x86: cpufeature: fix SMX flag (diff) | |
| download | wireguard-linux-aa3341a168883654d1b13f5931c5ed2762537831.tar.xz wireguard-linux-aa3341a168883654d1b13f5931c5ed2762537831.zip | |
Merge branch 'x86/cpu' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions