diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
| commit | 431dffc1df07b93ce9be26d264b7946cd65cb949 (patch) | |
| tree | f8aaf7d46c8d90f5b2ebe0d6af6f8991b658ea0b /lib/buildid.c | |
| parent | 57d3909596f9941c7d0777004994438df1b5ba0a (diff) | |
| parent | c6c97210e27237438689611980f8a7b87bcc79bf (diff) | |
| download | linux-431dffc1df07b93ce9be26d264b7946cd65cb949.tar.gz linux-431dffc1df07b93ce9be26d264b7946cd65cb949.tar.bz2 linux-431dffc1df07b93ce9be26d264b7946cd65cb949.zip | |
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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'lib/buildid.c')
0 files changed, 0 insertions, 0 deletions