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

diff --cc drivers/spi/Kconfig
index 28147c8031c6ba30292e9a14e2cee87f000557ca,9d8c84bb15446a75153d64f94a5900ab165193ac,9d8c84bb15446a75153d64f94a5900ab165193ac,720c5ee515c7760a1289b0958382100e0f46501b,8a8ff5051c64eb7d6e1c952e66d2d5a30f28d901,0f507552ed3e80e89d31d8459d2d02aa6015305a..b189508ccf92c53e6908f1722c572f55074f3438
--- 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