Merge tag 'imx-dt64-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Mar 2016 22:02:27 +0000 (23:02 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Mar 2016 22:02:27 +0000 (23:02 +0100)
Merge "NXP/Freescale arm64 dts update for 4.6" from Shawn Guo:

- Add "snps,quirk-frame-length-adjustment" property to USB3 node for
  erratum A009116, which affects NXP/Freescale arm64 SoCs LS1043A and
  LS2080A.

* tag 'imx-dt64-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: ls1043a: Add quirk for Erratum A009116
  arm64: dts: ls2080a: Add quirk for Erratum A009116


Trivial merge