• Linus Torvalds's avatar
    Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5e512d07
    Linus Torvalds authored
    Pull arm soc-specific updates from Arnd Bergmann:
     "This is stuff that does not fit well into another category and in
      particular is not related to a particular board.  The largest part in
      here is extending the am33xx support in the omap platform."
    
    Fix up trivial conflicts in arch/arm/mach-{imx/mach-mx35_3ds.c, tegra/Makefile}
    
    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (74 commits)
      ARM: LPC32xx: Add PWM support
      ARM: LPC32xx: Add PWM clock
      ARM: LPC32xx: Set system serial based on cpu unique id
      ARM: vexpress: Config option for early printk console
      ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
      ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
      ARM: vexpress: Add fixed regulator for SMSC
      ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
      ARM: vexpress: Initial common clock support
      ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
      ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
      ARM: EXYNOS: Make combiner_init function static
      ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
      ARM: versatile: Make plat-versatile clock optional
      ARM: vexpress: Check master site in daughterboard's sysctl operations
      ARM: vexpress: remove automatic errata workaround selection
      ARM: LPC32xx: Adjust to pl08x DMA interface changes
      ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
      ARM: imx: fix mx51 ehci setup errors
      ARM: imx: make ehci power/oc polarities configurable
      ...
    5e512d07
Makefile 1.37 KB