From: Linus Torvalds Date: Mon, 15 Jul 2013 22:43:51 +0000 (-0700) Subject: Merge tag 'spi-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi X-Git-Tag: v3.11-rc2~26 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f28b894b14fb8d23b0d03d0f77e9a0ec7946b3;p=pandora-kernel.git Merge tag 'spi-v3.11-rc1' of git://git./linux/kernel/git/broonie/spi Pull spi fixes from Mark Brown: "A couple of things missed during the v3.11 work here: - The spi-bitbang core requires a setup() function even if it does nothing which caused breakage when some empty setup functions were removed after their contents were factored out into the core. While this is clearly silly and will be fixed for v3.12 for now we just restore the functions. - A missing case handled in the s3c64xx driver" * tag 'spi-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: revert master->setup function removal for altera and nuc900 spi/xilinx: Revert master->setup function removal spi: s3c64xx: add missing check for polling mode --- f5f28b894b14fb8d23b0d03d0f77e9a0ec7946b3 Reading git-diff-tree failed