Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6