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: omap-for-v3.19/fixes-rc1~131^2~3^4~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a40242c82cd73cfcea305f23e67d068dd8401a;p=pandora-kernel.git

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

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

b7a40242c82cd73cfcea305f23e67d068dd8401a
Reading git-diff-tree failed