From: Mark Brown <broonie@kernel.org>
Date: Tue, 27 Jan 2015 17:52:51 +0000 (+0000)
Subject: Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a7834aa932e245a13fb2da59471672ca9bf3a7a5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'topic/rt286' of git://git./linux/kernel/git/broonie/sound into asoc-w-codec

Conflicts:
	sound/soc/codecs/rt286.c
---

a7834aa932e245a13fb2da59471672ca9bf3a7a5