]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'for-5.12/playstation' into for-next
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 17 Feb 2021 17:36:20 +0000 (18:36 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 17 Feb 2021 17:36:20 +0000 (18:36 +0100)
1  2 
drivers/hid/Kconfig

Simple merge