From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 3 Apr 2013 17:22:44 +0000 (+0100)
Subject: ASoC: core: Merge Samsung fixes to avoid trivial context conflict
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~52^2~42^2~24^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89cab4624a8c0ed81a1b74b6f8c884641cac5b9d;p=pandora-kernel.git

ASoC: core: Merge Samsung fixes to avoid trivial context conflict

Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict

Conflicts:
	sound/soc/samsung/i2s.c
---

89cab4624a8c0ed81a1b74b6f8c884641cac5b9d
Reading git-diff-tree failed