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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 19 Mar 2015 14:48:34 +1100

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                    [email-masked]