Merge branch 'for-5.11/sony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 16 Dec 2020 10:42:47 +0000 (11:42 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 Dec 2020 10:42:47 +0000 (11:42 +0100)
commit4d3d3d70cc9072acb2e643102421923ef90fdd97
tree7b455f84b87ffbfbac63d7bdeb5ed4f12f06cdc1
parent47cdd7f139dc3e896a627e8c0e98d0501555a889
parentcc894ac553605c9193a7a94372ff2f8af5766f46
Merge branch 'for-5.11/sony' into for-linus

- DS4 power and firmware reporting fixes, from Roderick Colenbrander
- support for ghlive PS3/WII u dongles, from Pascal Giard
drivers/hid/Kconfig
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c