Handle the merge issues and take the iio and staging driver fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
bmi160 | ||
inv_mpu6050 | ||
st_lsm6dsx | ||
Kconfig | ||
Makefile | ||
adis.c | ||
adis16400.h | ||
adis16400_buffer.c | ||
adis16400_core.c | ||
adis16480.c | ||
adis_buffer.c | ||
adis_trigger.c | ||
kmx61.c |