Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 17 Dec 2011 09:05:46 +0000 (10:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 17 Dec 2011 09:05:46 +0000 (10:05 +0100)
1  2 
sound/soc/mid-x86/sst_platform.c

Simple merge