4096e645d8
This fixes some merge issues with some iio drivers that were found in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ak8975.c | ||
| bmc150_magn.c | ||
| bmc150_magn.h | ||
| bmc150_magn_i2c.c | ||
| bmc150_magn_spi.c | ||
| hid-sensor-magn-3d.c | ||
| hmc5843.h | ||
| hmc5843_core.c | ||
| hmc5843_i2c.c | ||
| hmc5843_spi.c | ||
| mag3110.c | ||
| mmc35240.c | ||
| st_magn.h | ||
| st_magn_buffer.c | ||
| st_magn_core.c | ||
| st_magn_i2c.c | ||
| st_magn_spi.c | ||