linux-next: manual merge of the spi tree with the sound-asoc tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-s3c64xx.c between commit b5be04d35dbb ("spi: s3c64xx:
Modify SPI driver to use generic DMA DT support") from the sound-asoc tree and
commit 75bf33611041 ("spi/s3c64xx: fix checkpatch warnings and error")
from the spi tree.

I fixed it up (the former removed a function modified by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature