![]() 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_mpu_core.c | ||
inv_mpu_iio.h | ||
inv_mpu_ring.c | ||
inv_mpu_trigger.c | ||
Kconfig | ||
Makefile |