Merge commit 'v2.6.27-rc6' into x86/iommu

diff --cc arch/x86/kernel/amd_iommu.c
Simple merge

diff --cc arch/x86/kernel/pci-calgary_64.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge