From: Mark Brown <broonie@kernel.org>
Date: Mon, 20 Oct 2014 11:36:02 +0000 (+0100)
Subject: Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v3.20/drop-legacy-3517~123^2~20^2~12^6~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa664d63391c14f52264eb08d70f8a074ae249e;p=pandora-kernel.git

Merge branch 'fix/sgtl5000' of git://git./linux/kernel/git/broonie/sound into asoc-sgtl5000

Conflicts:
	Documentation/devicetree/bindings/sound/sgtl5000.txt
---

5aa664d63391c14f52264eb08d70f8a074ae249e
Reading git-diff-tree failed