From: Mark Brown <broonie@kernel.org>
Date: Tue, 10 Mar 2015 10:37:02 +0000 (+0000)
Subject: Merge tag 'v4.0-rc3' into asoc-rt5670
X-Git-Tag: firefly_0821_release~176^2~1862^2~14^2~10^2~20^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eb5bc2a213f96bd43b5f00a625acb0c669613645;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v4.0-rc3' into asoc-rt5670

Linux 4.0-rc3

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

eb5bc2a213f96bd43b5f00a625acb0c669613645