From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 5 Jan 2011 10:06:55 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-2.6.37' into for-2.6.38

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

74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468