From: Mark Brown <broonie@linaro.org>
Date: Mon, 5 Aug 2013 17:12:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
X-Git-Tag: v3.12-rc1~150^2~9^2~33^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2;p=pandora-kernel.git

Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm

Trivial add/add conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
---

6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2
Reading git-diff-tree failed