Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof
authorMark Brown <broonie@linaro.org>
Mon, 30 Jun 2014 18:58:56 +0000 (19:58 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 30 Jun 2014 18:58:56 +0000 (19:58 +0100)
Conflicts:
drivers/spi/spi-sh-msiof.c


Trivial merge