Messages in this thread | | | From | Thierry Reding <> | Subject | linux-next: manual merge of the mfd-lj tree | Date | Fri, 25 Oct 2013 15:03:41 +0200 |
| |
Today's linux-next merge of the mfd-lj tree got conflicts in
sound/soc/codecs/mc13783.c
caused by commits 9f6f0af (ASoC: mc13783: add spi errata fix), fd792f8 (mfd: mc13xxx: Move SPI erratum workaround into SPI I/O function) and 2d9215c (ASoC: mc13783: Use regmap directly from ASoC).
I fixed it up and the diff turned up empty, so I think it can't be all that wrong.
Thanks, Thierry
| |