Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts: arch/x86/kernel/io_apic.c
2008-12-31 23:05:57 +10:30
parent e12f0102ac 6a94cb7306
commit 2ca1a61583
2084 changed files with 144487 additions and 50597 deletions
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@ -84,6 +84,8 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 static inline void early_quirks(void) { }
 #endif

+extern void pci_iommu_alloc(void);
+
 #endif  /* __KERNEL__ */

 #ifdef CONFIG_X86_32