• Linus Torvalds's avatar
    Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f1d2c07d
    Linus Torvalds authored
    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
      ...
    f1d2c07d
mach-crag6410.c 19.8 KB