From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Jan 2017 15:17:46 +0000 (+0100)
Subject: Merge tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v4.14-rc1~1671^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad040d8df6eb3a6d4b85ef69448d370d0065843c;p=platform%2Fkernel%2Flinux-rpi3.git

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

Pull "i.MX fixes for 4.10" from Shawn Guo:

 - A format fix for vf610-zii-dev-rev-b.dts, which has a very odd line
   due to misses a newline.
 - A fix to imx-weim bus error seen on board which doesn't actually use
   the bus.
 - A fix for imx6qdl-nitrogen6x board which has conflicting usage of
   pad NANDF_CS2.
 - A cleanup on i.MX1 machine to remove .map_io callback, which also
   fixes a compiling error for NOMMU build.
 - Fix AVIC base address in i.MX31 device tree source.  The problem was
   shadowed by the AVIC driver, which takes the correct base address
   from a SoC specific header file.

* tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6: Disable "weim" node in the dtsi files
  ARM: i.MX: remove map_io callback
  ARM: dts: vf610-zii-dev-rev-b: Add missing newline
  ARM: dts: imx6qdl-nitrogen6x: remove duplicate iomux entry
  ARM: dts: imx31: fix AVIC base address
---

ad040d8df6eb3a6d4b85ef69448d370d0065843c