tree 7c28b1e5baaff4741d974193ba30f1c53992596f
parent 7355a5a654ccbbfd2fd11bb1e2389910f786ea92
parent 1a8bd481bfba30515b54368d90a915db3faf302f
author Linus Torvalds <torvalds@linux-foundation.org> 1281918860 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281918860 -0700

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