From: Mark Brown <broonie@kernel.org>
Date: Tue, 6 Jan 2015 11:06:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~168^2~6^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b038c8d2b99b552f0b025c8a134f8a3c417a3e7;p=pandora-kernel.git

Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof

Conflicts:
	drivers/spi/spi-sh-msiof.c
---

6b038c8d2b99b552f0b025c8a134f8a3c417a3e7
Reading git-diff-tree failed