linux/arch/ia64/sn/pci
Ingo Molnar af2519fb22 Merge branch 'linus' into core/iommu
Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h
2009-01-16 10:09:10 +01:00
..
pcibr
Makefile
pci_dma.c Merge branch 'linus' into core/iommu 2009-01-16 10:09:10 +01:00
tioca_provider.c [IA64] arch/ia64/sn/pci/tioca_provider.c: introduce missing kfree 2008-09-10 10:49:36 -07:00
tioce_provider.c