From: Mark Brown <broonie@linaro.org>
Date: Tue, 17 Sep 2013 12:25:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/component' into asoc-core
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~14^2~72^2~37^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d930ce26e01470590cd003484b32df29529906c;p=pandora-kernel.git

Merge remote-tracking branch 'asoc/topic/component' into asoc-core

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

7d930ce26e01470590cd003484b32df29529906c
Reading git-diff-tree failed