On Tue, Dec 03, 2013 at 11:38:52AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in
> sound/soc/fsl/fsl_ssi.c between commit bf02c7cb4314 ("ASoC: fsl_ssi: Add
> dual fifo mode support") from the slave-dma tree and commit 2924a9981006
> ("ASoC: fsl_ssi: Add monaural audio support for non-ac97 interface") from
> the sound-asoc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.