From: Olof Johansson <olof@lixom.net>
Date: Fri, 29 Jun 2018 21:06:49 +0000 (-0700)
Subject: Merge tag 'hisi-fixes-for-4.18' of git://github.com/hisilicon/linux-hisi into fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=35911e01e5a374e3953b53d72e1a7e7c219f47a9;p=linux.git

Merge tag 'hisi-fixes-for-4.18' of git://github.com/hisilicon/linux-hisi into fixes

ARM64: hisi fixes for 4.18

- Added power capabilities for the mmc host controller on the
  hikey and hikey960 boards to avoid broken wifi.

* tag 'hisi-fixes-for-4.18' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hikey960: Define wl1837 power capabilities
  arm64: dts: hikey: Define wl1835 power capabilities

Signed-off-by: Olof Johansson <olof@lixom.net>
---

35911e01e5a374e3953b53d72e1a7e7c219f47a9