From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Aug 2010 00:34:20 +0000 (-0700)
Subject: Merge git://git.infradead.org/iommu-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2e96c663639a3361bb1a84e666887d308c6c87e;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix 32-bit build warning with __cmpxchg()
  intr-remap: allow disabling source id checking
---

e2e96c663639a3361bb1a84e666887d308c6c87e