Merge remote-tracking branch 'cris/for-next'

Conflicts:
	arch/cris/arch-v32/drivers/Kconfig

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/cris/arch-v10/drivers/Kconfig
Simple merge

diff --cc arch/cris/arch-v32/drivers/Kconfig
index 1d866d3ee2f85329bfbd4b94130c6ccaf1035804,f1b717274b9b4682805e0cd2ece049d5488e5819..6792503aaf79effd5adfcf50591d0978de6c729c
--- 1/arch/cris/arch-v32/drivers/Kconfig
--- 2/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@@ -782,51 -441,9 +435,4 @@@ config ETRAX_SPI_GPI
          Say m to build it as a module, which will be called spi_crisv32_gpio.
          (You need to select MMC separately.)
  
- # The default match that of sser0, only because that's how it was tested.
- config ETRAX_SPI_CS_PIN
-       string "SPI chip select pin"
-       depends on ETRAX_SPI_GPIO
-       default "pc3"
-       help
-         The pin to use for SPI chip select.
- 
- config ETRAX_SPI_CLK_PIN
-       string "SPI clock pin"
-       depends on ETRAX_SPI_GPIO
-       default "pc1"
-       help
-         The pin to use for the SPI clock.
- 
- config ETRAX_SPI_DATAIN_PIN
-       string "SPI MISO (data in) pin"
-       depends on ETRAX_SPI_GPIO
-       default "pc16"
-       help
-         The pin to use for SPI data in from the device.
- 
- config ETRAX_SPI_DATAOUT_PIN
-       string "SPI MOSI (data out) pin"
-       depends on ETRAX_SPI_GPIO
-       default "pc0"
-       help
-         The pin to use for SPI data out to the device.
- 
- config ETRAX_SPI_MMC_CD_GPIO_PIN
-       string "MMC/SD card detect pin for SPI using gpio (space for none)"
-       depends on ETRAX_SPI_GPIO && MMC_SPI
-       default "pd11"
-       help
-         The pin to use for SD/MMC card detect.  This pin should be pulled up
-         and grounded when a card is present.  If defined as " " (space), no
-         pin is selected.  A card must then always be inserted for proper
-         action.
- 
- config ETRAX_SPI_MMC_WP_GPIO_PIN
-       string "MMC/SD card write-protect pin for SPI using gpio (space for none)"
-       depends on ETRAX_SPI_GPIO && MMC_SPI
-       default "pd10"
-       help
-         The pin to use for the SD/MMC write-protect signal for a memory
-         card.  If defined as " " (space), the card is considered writable.
 -# Avoid choices causing non-working configs by conditionalizing the inclusion.
 -if ETRAX_SPI_MMC
 -source drivers/spi/Kconfig
 -endif
--
  endif

diff --cc arch/cris/include/asm/processor.h
Simple merge