| commit | 35911e01e5a374e3953b53d72e1a7e7c219f47a9 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Jun 29 14:06:49 2018 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Jun 29 14:06:49 2018 -0700 |
| tree | 2b7762853bb9084a5aa5ec6f47d4ad8a48412275 | |
| parent | d2d369a9618be01b1f59965b447bb49e7c4ec305 [diff] | |
| parent | a30449eb3ac908f26b4bc963a58039a5f2725ffa [diff] |
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>