From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Aug 2017 15:34:04 +0000 (+0200)
Subject: Merge tag 'imx-fixes-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v4.13-rc6~12^2~6
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=69a80d8c2cb0956fc2aab41aae786ed0c663b582;hp=-c

Merge tag 'imx-fixes-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

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

 - A fix for imx7d-sdb board to move pinctrl_spi4 pins from low power
   iomux controller to normal iomuxc node, as the pins belong to normal
   iomuxc rather than low power one.

* tag 'imx-fixes-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-sdb: Put pinctrl_spi4 in the correct location
---

69a80d8c2cb0956fc2aab41aae786ed0c663b582