Merge branch 'ib-iio-i2c-5.13rc1' into togreg
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 7 Jun 2021 08:20:02 +0000 (09:20 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 7 Jun 2021 08:20:02 +0000 (09:20 +0100)
Adds a stub needed to resolve a build conflict for the
fxls8962af driver.


Trivial merge