Subject: linux-next: manual merge of the pci-current tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 1 Aug 2008 10:22:45 +1000

Hi Jesse,

Today's linux-next merge of the pci-current tree got a conflict in
arch/x86/kernel/pci-gart_64.c between commit
7968531880c89b3c987e6a7a0d33eafb0962d8d9 ("Revert "Merge branch
'x86/iommu' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into
for-linus"") from the linux-next tree and commit
074ec1727196c4a2ba2f909902d55ec5014e50c3 ("PCI: GART iommu alignment
fixes") from the pci-current tree.

This is, of course caused by my revert of the iommu_num_pages patches.  I
fixed it up as best I could. 
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/