From: Mark Brown <broonie@kernel.org>
Date: Tue, 7 Apr 2015 10:54:40 +0000 (+0100)
Subject: Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.1-rc1~163^2~3^3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa;p=users%2Fjedix%2Flinux-maple.git

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

Conflicts:
	drivers/spi/spi-fsl-dspi.c
---

63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa