From: Mark Brown <broonie@linaro.org>
Date: Mon, 14 Apr 2014 16:42:28 +0000 (+0100)
Subject: Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~21^2~52^2~14^2~7^3~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa0258adf6078a41a3db06f4e498253aff64d151;p=pandora-kernel.git

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

Conflicts:
	sound/soc/soc-core.c
---

aa0258adf6078a41a3db06f4e498253aff64d151
Reading git-diff-tree failed