Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt5645...
authorMark Brown <broonie@kernel.org>
Tue, 16 Dec 2014 11:52:34 +0000 (11:52 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 16 Dec 2014 11:52:34 +0000 (11:52 +0000)
1  2  3  4  5  6 
sound/soc/codecs/rt5645.c
sound/soc/samsung/i2s.c

Simple merge
Simple merge