]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge