Subject: linux-next: manual merge of the iommu tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 6 Jan 2009 16:57:30 +1100

Hi Ingo,

Today's linux-next merge of the iommu tree got a conflict in
lib/swiotlb.c between commit 52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c
("swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c") from
the tip-core tree and commit fb05a37929e0cd99016b4f5e5a5ef077fb10a947
("swiotlb: add support for systems with highmem") from the iommu tree.

Just trivial overlapping add/removal of header includes.  I fixed it up
and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/