Merge branch 'for-5.12/i2c-hid' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 23 Feb 2021 10:33:54 +0000 (11:33 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 23 Feb 2021 10:33:54 +0000 (11:33 +0100)
commit27b730e088ff41e43f543a3f8e2042b9ee8ce2f1
tree94f8058da298043f5c3fe00e9a5d9a90c79db50b
parentd6310078d9f8c416e85f641a631aecf58f9c97ff
parentc1ed18c11bdb80eced208a61d40b1988f36a014f
Merge branch 'for-5.12/i2c-hid' into for-linus

- ACPI and OF support made more generic / decoupled. From Douglas Anderson
- support for Goodix devices from Douglas Anderson
drivers/hid/i2c-hid/i2c-hid-core.c