From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Dec 2016 19:00:39 +0000 (-0800)
Subject: Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.9~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f6c926c0aa9180d42fcda53578881fc57f83a9a;p=uclinux-h8%2Flinux.git

Merge tag 'armsoc-fixes' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Final batch of SoC fixes

  A few fixes that have trickled in over the last week, all fixing minor
  errors in devicetrees -- UART pin assignment on Allwinner H3,
  correcting number of SATA ports on a Marvell-based Linkstation
  platform and a display clock fix for Freescale/NXP i.MX7D that fixes a
  freeze when starting up X"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: orion5x: fix number of sata port for linkstation ls-gl
  ARM: dts: imx7d: fix LCDIF clock assignment
  dts: sun8i-h3: correct UART3 pin definitions
---

1f6c926c0aa9180d42fcda53578881fc57f83a9a