![]() This resolves the conflicts in the files: drivers/iio/adc/Kconfig drivers/staging/rtl8723au/os_dep/usb_ops_linux.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
inv_mpu6050 | ||
adis.c | ||
adis16400.h | ||
adis16400_buffer.c | ||
adis16400_core.c | ||
adis16480.c | ||
adis_buffer.c | ||
adis_trigger.c | ||
Kconfig | ||
Makefile |