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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the dma-mapping tree got a conflict in
mm/Kconfig between commit bf550fc93d98 ("Merge remote-tracking branch
'origin/next' into kvm-ppc-next") from the kvm-ppc tree and commit
f7d8f1e9cb44 ("Merge remote-tracking branch
'dma-public/for-v3.12-cma-dma' into for-next") from the dma-mapping tree.

I fixed it up (these two merges resolved the conflict different ways, I
just arbitrarily picked the kvm-ppc tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpBUA2eClKRm.pgp
Description: PGP signature