From: Mark Brown Date: Wed, 16 Oct 2013 20:16:41 +0000 (+0100) Subject: Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=381bd9517a7e611871694689c67901d189cf6a62;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel Conflicts (trivial overlapping cleanups): drivers/spi/spi-atmel.c --- 381bd9517a7e611871694689c67901d189cf6a62