From: Mark Brown <broonie@kernel.org>
Date: Tue, 7 Jul 2015 14:04:40 +0000 (+0100)
Subject: Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-for-v4.3/fixes-rc1~91^2~7^2~21^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2a763858a7d0236d658116918c7b1e2c7a5e0cf;p=pandora-kernel.git

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

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

f2a763858a7d0236d658116918c7b1e2c7a5e0cf
Reading git-diff-tree failed