diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 19:30:33 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 19:30:33 +0400 |
| commit | 0791e98dd1cd1833547f814188b25b6c8c711ad5 (patch) | |
| tree | 7a55a18a4d10d1f8565be7399381f543362cbb32 /net/nfc/core.c | |
| parent | edb34a4dbdfec6fd83fe907dbf4498eedc77e17e (diff) | |
| parent | 141d55e6cc590293ea1378f55b9ebd38f5024bf0 (diff) | |
| download | linux-0791e98dd1cd1833547f814188b25b6c8c711ad5.tar.xz | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/irq: Standardize on CONFIG_SPARSE_IRQ=y
x86, ioapic: Clean up ioapic/apic_id usage
x86, ioapic: Factor out print_IO_APIC() to only print one io apic
x86, ioapic: Print out irte with right ioapic index
x86, ioapic: Split up setup_ioapic_entry()
x86, ioapic: Pass struct irq_attr * to setup_ioapic_irq()
apic, i386/bigsmp: Fix false warnings regarding logical APIC ID mismatches
Diffstat (limited to 'net/nfc/core.c')
0 files changed, 0 insertions, 0 deletions