From: Mark Brown Date: Sat, 11 Apr 2015 22:08:54 +0000 (+0100) Subject: Merge remote-tracking branch 'spi/fix/img-spfi' into spi-linus X-Git-Tag: v4.1-rc1~163^2~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=68a595c7754d22bfe741a27c7df0965160df575d;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'spi/fix/img-spfi' into spi-linus --- 68a595c7754d22bfe741a27c7df0965160df575d