Skip to content
Commit 41340965 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

Merge branch 'ib-iio-i2c-5.13rc1' into togreg 

Adds a stub needed to resolve a build conflict for the
fxls8962af driver.
parents 9654c414 aa5c8b25
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment