Merge commit 'v2.6.27-rc6' into x86/iommu
authorIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 09:32:52 +0000 (11:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 09:32:52 +0000 (11:32 +0200)
commite92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1
tree4f84567261682d8ec2ad4102bce1ff970a6eed1a
parent9fcaff0e660d886e9a766460adbe558dd25de31b
parentadee14b2e1557d0a8559f29681732d05a89dfc35
Merge commit 'v2.6.27-rc6' into x86/iommu
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/pci-calgary_64.c
include/linux/pci_ids.h