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)
commit19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0
tree16d625cdf57212c70b2eae5d86e3924ff3116031
parentb0d0ce8b6b91a0f6f99045b6019fc4c824634fb4
parent8e3489f3b6c159079cf690d0913409e1178ccf2f
Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof

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