Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/config', 'spi/topic...

diff --combined drivers/spi/Kconfig
index 99829985c1a194ebe6edc0e73912077bade693d3,99829985c1a194ebe6edc0e73912077bade693d3,2350efe997ecbe8f5aa463ae79cf35b7ebda8c16,f60f37c34afa71550d8af31f370e43816999c7ec,99829985c1a194ebe6edc0e73912077bade693d3..49336a7c780f4ebe77184542ca0ca8afef43856f
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@ -185,6 -185,6 -185,6 -185,16 -185,6 +185,16 @@@@@@ config SPI_DAVINC
        help
          SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
     
+++ +config SPI_DLN2
+++ +       tristate "Diolan DLN-2 USB SPI adapter"
+++ +       depends on MFD_DLN2
+++ +       help
+++ +         If you say yes to this option, support will be included for Diolan
+++ +         DLN2, a USB to SPI interface.
+++ +
+++ +         This driver can also be built as a module.  If so, the module
+++ +         will be called spi-dln2.
+++ +
     config SPI_EFM32
        tristate "EFM32 SPI controller"
        depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
@@@@@@ -595,7 -595,7 -595,6 -605,7 -595,7 +605,6 @@@@@@ config SPI_XTENSA_XTFPG
          16 bit words in SPI mode 0, automatically asserting CS on transfer
          start and deasserting on end.
     
-- --
     config SPI_NUC900
        tristate "Nuvoton NUC900 series SPI"
        depends on ARCH_W90X900