lkml.org 
[lkml]   [2013]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Subjectlinux-next: manual merge of the mfd-lj tree
Date
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


\
 
 \ /
  Last update: 2013-10-25 16:01    [W:0.183 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site