* linux-next: manual merge of the spi tree with the sound-asoc tree
@ 2013-02-06 4:08 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-02-06 4:08 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, Jingoo Han, Padmavathi Venna,
Mark Brown, Liam Girdwood
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-06 4:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-06 4:08 linux-next: manual merge of the spi tree with the sound-asoc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).