Merge remote-tracking branches 'asoc/fix/adi', 'asoc/fix/compress', 'asoc/fix/fsl...
authorMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:55 +0000 (11:29 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:55 +0000 (11:29 +0000)
1  2  3  4  5  6  7  8  9 
sound/soc/rockchip/rockchip_i2s.c

Simple merge