OSDN Git Service

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)
commitf2a763858a7d0236d658116918c7b1e2c7a5e0cf
treecf86a7b3b2c9f5710506dfb940567f1750869c18
parent83c09290adfb025d9a109d9c3c2956c81bcb241b
parent4890140f3888b4a4baef90d84e278858afe45248
Merge branch 'topic/codec-dapm' of git://git./linux/kernel/git/broonie/sound into asoc-rt5645

Conflicts:
sound/soc/codecs/rt5645.c
sound/soc/codecs/rt5645.c