linux-next: manual merge of the spi tree with the slave-dma tree

[Stephen Rothwell]

Hi Mark,

Today's linux-next merge of the spi tree got conflicts in
drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c
between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses")
from the slave-dma tree and commit 36111da7838e ("dmaengine:
intel-mid-dma: remove the driver") from the spi tree.

I fixed it up (I just removed the files) and can carry the fix as
necessary (no action is required).

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

pgpLkI09OpVVp.pgp
Description: OpenPGP digital signature