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

Conflicts:
	arch/arm/mach-tegra/devices.c

diff --cc arch/arm/configs/tegra_defconfig
index adcf3c282e2d391fb000c4adc331c3a435be3308,0d6bb738c6de370e6d13462ca398c262749aa50f..e2184f6c20b3d3e6eeb9338794fb37375a7d9709
--- 1/arch/arm/configs/tegra_defconfig
--- 2/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@@ -162,19 -142,11 +162,21 @@@ CONFIG_MMC_BLOCK_MINORS=1
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_TEGRA=y
 +CONFIG_NEW_LEDS=y
 +CONFIG_LEDS_CLASS=y
 +CONFIG_LEDS_GPIO=y
 +CONFIG_LEDS_TRIGGERS=y
 +CONFIG_LEDS_TRIGGER_GPIO=y
  CONFIG_RTC_CLASS=y
 +CONFIG_RTC_INTF_SYSFS=y
 +CONFIG_RTC_INTF_PROC=y
 +CONFIG_RTC_INTF_DEV=y
 +CONFIG_RTC_DRV_MAX8907=y
 +CONFIG_RTC_DRV_TPS65910=y
  CONFIG_RTC_DRV_EM3027=y
  CONFIG_RTC_DRV_TEGRA=y
+ CONFIG_DMADEVICES=y
+ CONFIG_TEGRA20_APB_DMA=y
  CONFIG_STAGING=y
  CONFIG_SENSORS_ISL29018=y
  CONFIG_SENSORS_ISL29028=y

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/tegra20_clocks.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra20_clocks_data.c
Simple merge

diff --cc drivers/spi/Kconfig
index 76631d0b1cae33e2aba14e37d8b848eecb476b57,2d198a01a41024a338b405c78b19d34d6829caf0..323ea8f5724c501bb432338d3262e9cb329fcab6
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -378,16 -364,9 +378,16 @@@ config SPI_STMP3XX
        help
          SPI driver for Freescale STMP37xx/378x SoC SSP interface
  
 +config SPI_MXS
 +      tristate "Freescale MXS SPI controller"
 +      depends on ARCH_MXS
 +      select STMP_DEVICE
 +      help
 +        SPI driver for Freescale MXS devices.
 +
  config SPI_TEGRA
        tristate "Nvidia Tegra SPI controller"
-       depends on ARCH_TEGRA && (TEGRA_SYSTEM_DMA || TEGRA20_APB_DMA)
+       depends on ARCH_TEGRA && TEGRA20_APB_DMA
        help
          SPI driver for NVidia Tegra SoCs
  

diff --cc drivers/spi/spi-tegra.c
Simple merge