]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
projects / users / griffoul / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47cdd7f cc894ac)
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)
- DS4 power and firmware reporting fixes, from Roderick Colenbrander
- support for ghlive PS3/WII u dongles, from Pascal Giard

1  2 
drivers/hid/Kconfig patch | diff1 | diff2 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | blob | history
drivers/hid/hid-sony.c patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-sony.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.