diff options
author | 2008-07-26 16:30:19 +0200 | |
---|---|---|
committer | 2008-07-26 16:30:19 +0200 | |
commit | 10d3285d0b3af641ee446f0be8f0a7f40cb515b6 (patch) | |
tree | 836ad323a1eae8a4bdd5ab5f5e4271efeb85cf8c /net/unix/af_unix.c | |
parent | Merge branch 'x86/x2apic' into x86/core (diff) | |
parent | x86, AMD IOMMU: include amd_iommu_last_bdf in device initialization (diff) | |
download | wireguard-linux-10d3285d0b3af641ee446f0be8f0a7f40cb515b6.tar.xz wireguard-linux-10d3285d0b3af641ee446f0be8f0a7f40cb515b6.zip |
Merge branch 'x86/urgent' into x86/core
Conflicts:
include/asm-x86/gpio.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions