From: Mark Brown <broonie@linaro.org>
Date: Thu, 6 Mar 2014 09:07:39 +0000 (+0800)
Subject: Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v3.15-rc1~36^2~1^2~5^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6af5263ceaffc9d4403592dc81cd3b197702dc69;p=pandora-kernel.git

Merge branch 'topic/pcm' of git://git./linux/kernel/git/broonie/sound into asoc-enum

Conflicts:
	include/sound/soc.h
---

6af5263ceaffc9d4403592dc81cd3b197702dc69
Reading git-diff-tree failed