Merge git://git.infradead.org/iommu-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Aug 2010 00:34:20 +0000 (17:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Aug 2010 00:34:20 +0000 (17:34 -0700)
* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix 32-bit build warning with __cmpxchg()
  intr-remap: allow disabling source id checking


Trivial merge