Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645

Conflicts:
	sound/soc/codecs/rt5645.c
This commit is contained in:
Mark Brown 2015-07-07 15:04:40 +01:00
commit f2a763858a
7 changed files with 67 additions and 82 deletions