]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branches 'for-5.11/upstream-fixes' and 'for-5.12/multitouch' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 26 Jan 2021 10:54:42 +0000 (11:54 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 26 Jan 2021 10:54:42 +0000 (11:54 +0100)
1  2  3 
drivers/hid/hid-multitouch.c

Simple merge