From: Mark Brown Date: Mon, 7 Oct 2013 13:51:59 +0000 (+0100) Subject: Merge remote-tracking branch 'spi/fix/pxa' into spi-linus X-Git-Tag: v3.12-rc5~22^2~1 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=896182ad319542e56dcf776565f92cb35c2b4abb;p=sfrench%2Fcifs-2.6.git Merge remote-tracking branch 'spi/fix/pxa' into spi-linus --- 896182ad319542e56dcf776565f92cb35c2b4abb