linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell
Date: Tue Sep 27 2011 - 03:14:15 EST
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in
drivers/iommu/dmar.c and include/linux/dmar.h between commit 318fe7df9d84
("iommu: Move IOMMU specific code to intel-iommu.c") from the tip tree
and commit 432fb2751763 ("When do pci remove/rescan on system that have
more iommus, got") from the akpm tree.
The former moved that code the the latter cares about to another files.
I have dropped this patch from the akpm tree for today.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature