a769f30c7b
This resolves the merge errors that were reported in linux-next and it picks up the staging and IIO fixes that we need/want in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
am2315.c | ||
dht11.c | ||
hdc100x.c | ||
hts221.h | ||
hts221_buffer.c | ||
hts221_core.c | ||
hts221_i2c.c | ||
hts221_spi.c | ||
htu21.c | ||
si7005.c | ||
si7020.c |