90b45399b4
We want the fixes and this resolves a merge issue as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
hid-sensor-temperature.c | ||
max31856.c | ||
maxim_thermocouple.c | ||
mlx90614.c | ||
mlx90632.c | ||
tmp006.c | ||
tmp007.c | ||
tsys01.c | ||
tsys02d.c |