Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@kernel.org>
Tue, 7 Jul 2015 14:04:40 +0000 (15:04 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 7 Jul 2015 14:04:40 +0000 (15:04 +0100)
Conflicts:
sound/soc/codecs/rt5645.c


Trivial merge