From: Mark Brown Date: Mon, 30 Jun 2014 18:58:56 +0000 (+0100) Subject: Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof Conflicts: drivers/spi/spi-sh-msiof.c --- 19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0