projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 65fdd5c) | patch
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)
commit169d5a83f687c37104d51cbaa639bdffca8a1cd3
treea0d49f301ef9067879eac5194a028288a641a1cdtree | snapshot (tar.gz zip)
parent65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1commit | diff
ASoC: Fix mismerge with release branch

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