From: Mark Brown Date: Mon, 6 May 2013 10:48:50 +0000 (+0100) Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant X-Git-Tag: firefly_0821_release~3680^2~479^2^2 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3086c9f6482101b3c06935cdfb4d4b56adb60097;p=firefly-linux-kernel-4.4.55.git Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant --- 3086c9f6482101b3c06935cdfb4d4b56adb60097