Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y
authorDom Cobley <popcornmix@gmail.com>
Fri, 30 Apr 2021 14:43:48 +0000 (15:43 +0100)
committerDom Cobley <popcornmix@gmail.com>
Fri, 30 Apr 2021 14:43:48 +0000 (15:43 +0100)
1  2 
Makefile
drivers/hid/hid-ids.h

diff --cc Makefile
Simple merge
Simple merge