]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: Fix mismerge with release branch
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 Jun 2011 08:51:50 +0000 (09:51 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 Jun 2011 08:51:50 +0000 (09:51 +0100)
commitc9a12c7eb780911b6a152ce8b19a3e3b305257ac
treea0d49f301ef9067879eac5194a028288a641a1cd
parent45cba26472b28768d5c9cf20012e866867d60c51
ASoC: Fix mismerge with release branch

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
include/sound/soc-dapm.h