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)
commite2e96c663639a3361bb1a84e666887d308c6c87e
tree7c28b1e5baaff4741d974193ba30f1c53992596f
parent7355a5a654ccbbfd2fd11bb1e2389910f786ea92
parent1a8bd481bfba30515b54368d90a915db3faf302f
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
Documentation/kernel-parameters.txt
drivers/pci/intel-iommu.c
drivers/pci/intr_remapping.c