Merge branch 'for-5.15/sony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
commit854a95877f4d95b65918cb126fdc0c84ea564676
tree5e9fffcc1a4a92916c8c26ba6efafa56f394c7b2
parent163a3124667901c29978bf67c0ffdcc9650515ac
parenta4bfe13f96bf8b1b2f233d16e960a3e0680d67fb
Merge branch 'for-5.15/sony' into for-linus

- Support for GHLive PS4 dongles
drivers/hid/Kconfig
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c