From: Mark Brown <broonie@kernel.org>
Date: Mon, 20 Oct 2014 16:55:07 +0000 (+0100)
Subject: Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b7a40242c82cd73cfcea305f23e67d068dd8401a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'fix/dw' of git://git./linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c
---

b7a40242c82cd73cfcea305f23e67d068dd8401a