diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 08:39:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 08:39:05 -0700 |
commit | 6924a4672dd07dbe11d76fe597d17a092434232f (patch) | |
tree | ab533f30241e9b4ce8bce0d4d08a37c4fffeb71e /arch/m68k/amiga/Makefile | |
parent | ac3c1c4f1c77190408162aee559c655090597072 (diff) | |
parent | 25aa2957973d361081ac6c8b6e5a0d9d7a83fef6 (diff) |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/apic changes from Ingo Molnar:
"Smaller fixes"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ioapic: Check attr against the previous setting when programmed more than once
x86/ioapic/kcrash: Prevent crash_kexec() from deadlocking on ioapic_lock
x86/acpi: Fix incorrect sanity check in acpi_register_lapic()
Diffstat (limited to 'arch/m68k/amiga/Makefile')
0 files changed, 0 insertions, 0 deletions