Merge branch 'tegra/soc' into next/cleanup2

Conflicts:
	arch/arm/mach-tegra/Makefile

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-tegra/Makefile
index 829066fdc2ad60ca85b1de04a2eefe7ec8124856,fc4ebe35f48404f396643e3434f94596202d0605..7517efbcf927b4797e31fccbc333becced76e477
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -13,8 -15,8 +15,9 @@@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += teg
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += pinmux-tegra20-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += pinmux-tegra30-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += board-dt-tegra30.o
 -obj-$(CONFIG_SMP)                       += platsmp.o localtimer.o headsmp.o
+ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += tegra30_clocks.o
 +obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
 +obj-$(CONFIG_LOCAL_TIMERS)            += localtimer.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
  obj-$(CONFIG_TEGRA_SYSTEM_DMA)                += dma.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o

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

diff --cc arch/arm/mach-tegra/include/mach/iomap.h
Simple merge