Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:56:57 +0000 (13:56 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:56:57 +0000 (13:56 +0100)
1  2 
sound/soc/mid-x86/sst_platform.c
sound/soc/soc-compress.c

Simple merge
Simple merge