diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 15:35:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 15:35:02 +0100 |
| commit | aa110a22b49d699aa1c1416776afc786fcc3148b (patch) | |
| tree | ebb620ea700be6de51a2ee1fabd9240ffd428a2f /arch/s390/kvm/interrupt.c | |
| parent | Merge tag 'v4.16-rockchip-dts32fixes-2' of ssh://gitolite.kernel.org/pub/scm/... (diff) | |
| parent | Revert "arm64: dts: rockchip: add usb3-phy otg-port support for rk3399" (diff) | |
| download | linux-aa110a22b49d699aa1c1416776afc786fcc3148b.tar.xz linux-aa110a22b49d699aa1c1416776afc786fcc3148b.zip | |
Merge tag 'v4.16-rockchip-dts64fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
Pull "Rockchip dts64 fixes for 4.16" from Heiko Stübner:
Pinctrl got a fix in 4.16-rc1, that exposed an issue with wifi-related
pinctrl hogs on rk3399-gru-kevin that broke suspend. This gets fixed
by moving the wifi pinctrl to the correct node.
Also revert the usb3 phy-port enablement, as a missing feature in the
type-c phy breaks usb on all non-gru rk3399 boards.
* tag 'v4.16-rockchip-dts64fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
Revert "arm64: dts: rockchip: add usb3-phy otg-port support for rk3399"
arm64: dts: rockchip: Fix rk3399-gru-* s2r (pinctrl hogs, wifi reset)
Diffstat (limited to 'arch/s390/kvm/interrupt.c')
0 files changed, 0 insertions, 0 deletions