linux-next: manual merge of the dma-mapping tree with the tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the dma-mapping tree got conflicts in
arch/arm/Kconfig and arch/x86/include/asm/dma-mapping.h between various
commits from Linus' tree and various commits from the dma-mapping tree.

Again, these commits were rebased from what was merged into Linus' tree
via other trees.   Please do not do this.

I just used the version of these files from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature