Merge tag 'imx-fixes-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
authorArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 09:58:38 +0000 (11:58 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 09:58:38 +0000 (11:58 +0200)
commit93112486f4b625130e7a998932b5fe6ff05bef3d
tree028679b25f45d9ece5c6b683761dbc7c21dc8087
parent552c497c406e49261e6bee6236dd9a3f8fdd7ab5
parentc40bc54fdf2d52a80f66b365f1eac9d43b32e107
Merge tag 'imx-fixes-4.13-3' of git://git./linux/kernel/git/shawnguo/linux into fixes

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

 - Fix PCIe reset GPIO of imx6qdl-nitrogen6_som2 board, which was
   a bad copy from nitrogen6_max device tree.

* tag 'imx-fixes-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-nitrogen6_som2: fix PCIe reset