Merge "Fix: f-l: usb_table borked rebase."
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 15 Jun 2016 14:54:39 +0000 (14:54 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 15 Jun 2016 14:54:39 +0000 (14:54 +0000)

Trivial merge