Commit 431dffc1 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg



The deta angle and deta velocity channels were added in parallel with
color temperature and chromacity so this merge had to assign a
consistent order. I put the color related ones second.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parents 57d39095 c6c97210
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment