Merge branch 'for-5.13/ft260' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 29 Apr 2021 19:40:07 +0000 (21:40 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 29 Apr 2021 19:40:07 +0000 (21:40 +0200)
commit8ba3c81c0872e0865a4c68a8eb1683ffd29a4580
tree06a1905a190ae25819b729b8c87b15bb9f2e86ad
parent743b357607ee9dabe049a89ac68f878c6e661687
parent2076b7bdc5290141cea809c8462b769836bd2757
Merge branch 'for-5.13/ft260' into for-linus

- Support for FTDI FT260 I2C host adapter from Michael Zaidman
drivers/hid/hid-ids.h