OSDN Git Service

Merge remote-tracking branches 'asoc/topic/fsl-easi', 'asoc/topic/fsl-sai', 'asoc...
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
1  2  3  4  5 
sound/soc/codecs/rt5640.c
sound/soc/fsl/fsl_ssi.c

Simple merge
Simple merge