Merge branch 'fix/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 20 Feb 2014 09:47:45 +0000 (18:47 +0900)
committerMark Brown <broonie@linaro.org>
Thu, 20 Feb 2014 09:47:45 +0000 (18:47 +0900)
1  2 
sound/soc/soc-dapm.c

Simple merge