Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Fri, 16 Jan 2009 09:09:10 +0000 (10:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 16 Jan 2009 09:09:10 +0000 (10:09 +0100)
commitaf2519fb2298cdf7540082c36f4d8c66bbff103f
tree1d290d28d42d42f9e693457762c4008988628060
parent961d7d0ee5150e0197cc81c2a8884ecb230276e2
parent7cb36b6ccdca03bd87e8faca7fd920643dd1aec7
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
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
arch/ia64/sn/pci/pci_dma.c
drivers/pci/intel-iommu.c