diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-20 20:16:53 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-20 20:19:36 +0100 |
| commit | b364776ad1208a71f0c53578c84619a395412a8d (patch) | |
| tree | d6050e5db6298095324ccb8af7d477684485d52e /MAINTAINERS | |
| parent | 6da0b38f4433fb0f24615449d7966471b6e5eae0 (diff) | |
| parent | 6c8909b42fee1be67647bcd2518161a0fa8ca533 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/intel-iommu.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 355c192d6997..22303e5fe4ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2176,6 +2176,13 @@ M: maciej.sosnowski@intel.com L: linux-kernel@vger.kernel.org S: Supported +INTEL IOMMU (VT-d) +P: David Woodhouse +M: dwmw2@infradead.org +L: iommu@lists.linux-foundation.org +T: git://git.infradead.org/iommu-2.6.git +S: Supported + INTEL IOP-ADMA DMA DRIVER P: Dan Williams M: dan.j.williams@intel.com |