Skip to content
  • Linus Torvalds's avatar
    Merge tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4d3639ac
    Linus Torvalds authored
    Pull ARM SoC fixes from Olof Johansson:
     "A batch of fixes that have come in during the merge window.
    
      Some of them are defconfig updates for things that have now landed,
      some errata additions and a few general scattered fixes.
    
      There's also a qcom DT update that adds support for SATA on AP148, and
      basic support for Sony Xperia Z1 and CM-QS600 platforms that seemed
      isolated enough that we could merge it even if it's late"
    
    * tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      MAINTAINERS: corrected bcm2835 search
      ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa
      ARM: dts: Explicitly set dr_mode on exynos Peach boards
      ARM: dts: qcom: add CM-QS600 board
      ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
      ARM: dts: qcom: Add SATA support on IPQ8064/AP148
      MAINTAINERS: Update Santosh Shilimkar's email id
      ARM: sunxi_defconfig: enable CONFIG_REGULATOR
      ARM: dts: Disable smc91x on n900 until bootloader dependency is removed
      ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3
      ARM: exynos_defconfig: enable USB gadget support
      ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers
      ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
      ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
      ARM: SAMSUNG: Restore Samsung PM Debug functionality
      ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
      ARM: exynos_defconfig: Enable SBS battery support
      ARM: exynos_defconfig: Enable Control Groups support
      ARM: exynos_defconfig: Enable Atmel maXTouch support
      ARM: exynos_defconfig: Enable MAX77802
    4d3639ac