OSDN Git Service

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)
commit41340965b4f8055f975f73e1e3d23eff8038f013
tree47e735aae5e56bdcb384fb98514bf21f8a2ac21f
parent9654c414bfdca1a62d17e8ae1085a5a2703b6a89
parentaa5c8b25392800bbefa82dd19eeff8ebbf261ace
Merge branch 'ib-iio-i2c-5.13rc1' into togreg
Adds a stub needed to resolve a build conflict for the
fxls8962af driver.