Merge branch 'spi' of git://git.denx.de/u-boot-x86