Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bcm2835

Conflicts:
	drivers/spi/spi-bcm2835.c