diff options
| author | Ingo Molnar <[email protected]> | 2008-12-23 15:24:15 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-23 15:24:15 +0000 |
| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /net/unix/af_unix.c | |
| parent | x86: hardirq: use inc_irq_stat() in non-unified functions (diff) | |
| parent | Merge commit 'v2.6.28-rc9' into x86/apic (diff) | |
| download | kernel-bf8bd66d0580f296f257d371ee41a0a137b541c7.tar.gz kernel-bf8bd66d0580f296f257d371ee41a0a137b541c7.zip | |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions