From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Date: Mon, 7 Jun 2021 08:20:02 +0000 (+0100)
Subject: Merge branch 'ib-iio-i2c-5.13rc1' into togreg
X-Git-Tag: v5.14-rc1~66^2~180^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41340965b4f8055f975f73e1e3d23eff8038f013;p=thirdparty%2Flinux.git

Merge branch 'ib-iio-i2c-5.13rc1' into togreg
Adds a stub needed to resolve a build conflict for the
fxls8962af driver.
---

41340965b4f8055f975f73e1e3d23eff8038f013