From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 12 Mar 2018 14:27:14 +0000 (+0100)
Subject: Merge tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux into next/soc
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fdda85f6969cadf4fda8c1eb15c1ac7ec8798bcd;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux into next/soc

Pull "This is the pxa changes for v4.17 cycle" from Robert Jarzmik:

 - minor changes for property API
 - clock API fix for ULPI driver warning

It exceptionally contains a merge from the mtd tree from Boris
to prevent any merge conflicts in the PXA tree.

* tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux:
  ARM: pxa/raumfeld: use PROPERTY_ENTRY_U32() directly
  ARM: pxa: ulpi: fix ulpi timeout and slowpath warn
  ARM: pxa: cm-x300: remove inline directive
  ARM: pxa: fix static checker warning in pxa3xx-ulpi
  MAINTAINERS: remove entry for deleted pxa3xx_nand driver
  arm: dts: pxa: use reworked NAND controller driver
  dt-bindings: mtd: remove pxa3xx NAND controller documentation
  mtd: nand: remove useless fields from pxa3xx NAND platform data
  mtd: nand: remove deprecated pxa3xx_nand driver
  mtd: nand: use Marvell reworked NAND controller driver with all platforms
---

fdda85f6969cadf4fda8c1eb15c1ac7ec8798bcd