Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Sat, 10 Jan 2009 23:51:06 +0000 (00:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 10 Jan 2009 23:51:06 +0000 (00:51 +0100)
commit0811a433c61e85f895018239c4466a36311cd5de
tree276933e518e5525d24ae37b02df2db9909679260
parentc299030765292434b73572f9bcfe84951ff06614
parent3d14bdad40315b54470cb7812293d14c8af2bf7d
Merge branch 'linus' into core/iommu
arch/ia64/kernel/pci-dma.c
arch/x86/kernel/pci-dma.c
lib/swiotlb.c