829455bb0e
We want the changes here, and we resolve the merge conflict that was happening in the nvec_kbd.c file. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| accel | ||
| adc | ||
| amplifiers | ||
| common | ||
| dac | ||
| frequency | ||
| gyro | ||
| imu | ||
| light | ||
| magnetometer | ||
| trigger | ||
| buffer_cb.c | ||
| iio_core.h | ||
| iio_core_trigger.h | ||
| industrialio-buffer.c | ||
| industrialio-core.c | ||
| industrialio-event.c | ||
| industrialio-trigger.c | ||
| industrialio-triggered-buffer.c | ||
| inkern.c | ||
| Kconfig | ||
| kfifo_buf.c | ||
| Makefile | ||