From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 27 Jan 2017 15:46:51 +0000 (+0100)
Subject: Merge tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu... 
X-Git-Tag: v5.15~11957^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec026b5020688a8bde5fae9a69ae3c59b66ba3ae;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'imx-fixes-4.10-3' of git://git./linux/kernel/git/shawnguo/linux into HEAD

Pull "i.MX fixes for 4.10, 3rd round" from Shawn Guo:
 - Fix a 'defined but not used' warning in MMDC driver when
   CONFIG_PERF_EVENTS is disabled.
 - Fix i.MX6DL device tree GPIO4_11 range setting.
 - A bandaid fix for boot failure found on a couple of platforms due to
   missing 'chosen' and 'memory' node.

* tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx: Pass 'chosen' and 'memory' nodes
  ARM: dts: imx6dl: fix GPIO4 range
  ARM: imx: hide unused variable in #ifdef
---

ec026b5020688a8bde5fae9a69ae3c59b66ba3ae