mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-29 05:23:37 +00:00
This resolves a merge issue with drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>