From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Oct 2011 14:11:53 +0000 (+0200)
Subject: Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.2-rc1~167
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=982653009b883ef1529089e3e6f1ae2fee41cbe2;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'core-iommu-for-linus' of git://git./linux/kernel/git/tip/tip

* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, ioapic: Consolidate the explicit EOI code
  x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()
  x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC
  iommu: Rename the DMAR and INTR_REMAP config options
  x86, ioapic: Define irq_remap_modify_chip_defaults()
  x86, msi, intr-remap: Use the ioapic set affinity routine
  iommu: Cleanup ifdefs in detect_intel_iommu()
  iommu: No need to set dmar_disabled in check_zero_address()
  iommu: Move IOMMU specific code to intel-iommu.c
  intr_remap: Call dmar_dev_scope_init() explicitly
  x86, x2apic: Enable the bios request for x2apic optout
---

982653009b883ef1529089e3e6f1ae2fee41cbe2