From: Mark Brown <broonie@linaro.org>
Date: Mon, 30 Jun 2014 18:58:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof
X-Git-Tag: v3.17-rc1~114^2^3~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof

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

19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0