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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
