We want the fixes in here, and we can resolve a merge issue in drivers/iio/industrialio-trigger.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| am2315.c | ||
| dht11.c | ||
| hdc100x.c | ||
| htu21.c | ||
| Kconfig | ||
| Makefile | ||
| si7005.c | ||
| si7020.c | ||
We want the fixes in here, and we can resolve a merge issue in drivers/iio/industrialio-trigger.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| am2315.c | ||
| dht11.c | ||
| hdc100x.c | ||
| htu21.c | ||
| Kconfig | ||
| Makefile | ||
| si7005.c | ||
| si7020.c | ||