From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Sep 2013 15:39:05 +0000 (-0700)
Subject: Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.12-rc1~165
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=6924a4672dd07dbe11d76fe597d17a092434232f;p=~andy%2Flinux

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()
---

6924a4672dd07dbe11d76fe597d17a092434232f