Commit 80f91ecb authored by Bastien Nocera's avatar Bastien Nocera

Merge branch 'master' into 'master'

elan: Add USB ID for TNP Nano USB Fingerprint Reader (04f3:0c26)

See merge request !1
parents 6f6127cb 6cb77465
Pipeline #1206 passed with stage
in 2 minutes and 33 seconds