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-Tag: v3.19-rc1~124^2~3^4~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7a40242c82cd73cfcea305f23e67d068dd8401a;p=thirdparty%2Fkernel%2Flinux.git

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

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

b7a40242c82cd73cfcea305f23e67d068dd8401a