Merge branches 'topic/core', 'topic/slave' and 'fix/doc' of...

Merge branches 'topic/core', 'topic/slave' and 'fix/doc' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-master