Merge branch 'linus' into core/iommu

This commit is contained in:
Ingo Molnar
2009-03-05 12:47:28 +01:00
2432 changed files with 68025 additions and 31269 deletions

View File

@@ -2,8 +2,8 @@
#define _ASM_X86_DMA_MAPPING_H
/*
* IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for
* documentation.
* IOMMU interface. See Documentation/PCI/PCI-DMA-mapping.txt and
* Documentation/DMA-API.txt for documentation.
*/
#include <linux/scatterlist.h>