e4c5bf8e3d
This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| accel | ||
| adc | ||
| Documentation | ||
| gyro | ||
| imu | ||
| light | ||
| magnetometer | ||
| trigger | ||
| chrdev.h | ||
| iio.h | ||
| industrialio-core.c | ||
| industrialio-ring.c | ||
| industrialio-trigger.c | ||
| Kconfig | ||
| Makefile | ||
| ring_generic.h | ||
| ring_hw.h | ||
| ring_sw.c | ||
| ring_sw.h | ||
| sysfs.h | ||
| TODO | ||
| trigger_consumer.h | ||
| trigger.h | ||