Merge branch 'for-5.4/ish' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sun, 22 Sep 2019 20:33:41 +0000 (22:33 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sun, 22 Sep 2019 20:33:41 +0000 (22:33 +0200)
commit979d859d3ff130ff212472d7fc67a474cdd96047
treef06c74385abfeeadd8a8f43ba318062f92cf41aa
parent98656d503dd62258bfa8aaf2cd702ad3491e0713
parentfc19a57dd4834a939b5eef574c61cd4f81af6cf8
Merge branch 'for-5.4/ish' into for-linus

- fixes for handling power management for intel-ish devices with NO_D3 flag
  set, from Zhang Lixu

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/intel-ish-hid/ipc/hw-ish.h
drivers/hid/intel-ish-hid/ipc/pci-ish.c