Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi...

diff --cc drivers/spi/Kconfig
index 28147c8,9d8c84b,9d8c84b,720c5ee,8a8ff50,0f50755..b189508
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
--- 6/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@ -435,6 -436,6 -436,6 -436,6 -436,12 -436,19 +435,19 @@@@@@@ config SPI_ORIO
        help
          This enables using the SPI master controller on the Orion chips.
      
++++  config SPI_PIC32
++++    tristate "Microchip PIC32 series SPI"
++++    depends on MACH_PIC32 || COMPILE_TEST
++++    help
++++      SPI driver for Microchip PIC32 SPI master controller.
++++  
+++++ config SPI_PIC32_SQI
+++++   tristate "Microchip PIC32 Quad SPI driver"
+++++   depends on MACH_PIC32 || COMPILE_TEST
+++++   depends on HAS_DMA
+++++   help
+++++     SPI driver for PIC32 Quad SPI controller.
+++++ 
      config SPI_PL022
        tristate "ARM AMBA PL022 SSP controller"
        depends on ARM_AMBA