Merge branch 'for-4.20/apple' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 23 Oct 2018 11:16:33 +0000 (13:16 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 23 Oct 2018 11:16:33 +0000 (13:16 +0200)
commit472475000979a156bc32cd75caa59737f5a1caa5
tree6a98319244f7954237cf866c8862ffe3f6128d2d
parent712fca63f50a87780ca6dc105370557a945a7ee8
parent9d7b18668956c411a422d04c712994c5fdb23a4b
Merge branch 'for-4.20/apple' into for-linus

Support for Apple Magic Trackpad 2
drivers/hid/hid-ids.h