]> www.infradead.org Git - users/willy/linux.git/commitdiff
Merge branch 'for-4.21/highres-wheel' into for-next
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Fri, 7 Dec 2018 16:06:02 +0000 (17:06 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Fri, 7 Dec 2018 16:06:02 +0000 (17:06 +0100)
1  2 
include/linux/hid.h
include/uapi/linux/input-event-codes.h

Simple merge