Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc board specific updates from Arnd Bergmann:
 "These changes are all for individual board files.  In the long run,
  those files will largely go away, and the amount of changes appears to
  be continuously decreasing, which is a good sign.  This time around,
  changes are focused on tegra, omap and samsung."

Fix conflicts in arch/arm/mach-{omap2/common-board-devices.c,tegra/Makefile.boot}
as per the 'for-linus' branch.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: EXYNOS: Add leds status1 and status2 on Origen board
  ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
  ARM: EXYNOS: Add missing .reserve field to SMDKC210
  ARM: EXYNOS: Add DRM device to SMDK4X12 board
  ARM: S3C64XX: Clean up after SPI driver platform data updates
  ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
  ARM: EXYNOS: Add framebuffer support for SMDK4X12
  ARM: EXYNOS: Add HSOTG support to SMDK4X12
  ARM: S5PV210: Add audio platform device in Goni board
  ARM: S5PV210: Add audio platform device in Aquila board
  ARM: EXYNOS: Add audio platform device in SMDKV310 board
  ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
  ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
  ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
  ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
  ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
  ARM: omap3evm: enable VBUS switch for EHCI tranceiver
  ARM: OMAP3EVM: Adding USB internal LDOs board file
  ARM: OMAP3EVM: Add NAND flash definition
  ARM: OMAP3: cm-t35: add tvp5150 decoder support
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

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

diff --cc arch/arm/mach-omap2/common-board-devices.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-tegra/Makefile
index 90aae34245cd32c13e8c5ba6a6d6de409342ee6f,1f6f237586e4846a6b2206ce0f5517715f9dab36..c3d7303b9ac8f07a662e25739c6362a8e7ee4fd8
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -8,13 -8,11 +8,12 @@@ obj-
  obj-y                                 += fuse.o
  obj-y                                 += pmc.o
  obj-y                                 += flowctrl.o
 +obj-y                                 += powergate.o
 +obj-y                                 += apbio.o
  obj-$(CONFIG_CPU_IDLE)                        += cpuidle.o
  obj-$(CONFIG_CPU_IDLE)                        += sleep.o
 -obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += powergate.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += tegra2_emc.o
- obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += board-dt-tegra30.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += tegra30_clocks.o
  obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_SMP)                       += reset.o

diff --cc arch/arm/mach-tegra/Makefile.boot
index 435f00ca3c5843db825b1648c7bc0acdd9961b48,a369f96bd05e0fef52283793ace9a209951b47fc..7a1bb62ddcf037b9b07e38a7835f2d2cf1d023f8
--- 1/arch/arm/mach-tegra/Makefile.boot
--- 2/arch/arm/mach-tegra/Makefile.boot
+++ b/arch/arm/mach-tegra/Makefile.boot
@@@ -2,10 -2,9 +2,10 @@@ zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)   +
  params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)       := 0x00000100
  initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)       := 0x00800000
  
- dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb
- dtb-$(CONFIG_MACH_PAZ00) += tegra20-paz00.dtb
- dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb
- dtb-$(CONFIG_MACH_TRIMSLICE) += tegra20-trimslice.dtb
- dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-harmony.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-paz00.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-seaboard.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-trimslice.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-ventana.dtb
 +dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-whistler.dtb
  dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb