diff options
author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-07 09:20:02 +0100 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-06-07 09:20:02 +0100 |
commit | 41340965b4f8055f975f73e1e3d23eff8038f013 (patch) | |
tree | 47e735aae5e56bdcb384fb98514bf21f8a2ac21f /drivers/counter | |
parent | 9654c414bfdca1a62d17e8ae1085a5a2703b6a89 (diff) | |
parent | aa5c8b25392800bbefa82dd19eeff8ebbf261ace (diff) |
Merge branch 'ib-iio-i2c-5.13rc1' into togreg
Adds a stub needed to resolve a build conflict for the
fxls8962af driver.
Diffstat (limited to 'drivers/counter')
0 files changed, 0 insertions, 0 deletions