949c3676cd
This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| accel | ||
| adc | ||
| addac | ||
| dac | ||
| dds | ||
| Documentation | ||
| gyro | ||
| imu | ||
| light | ||
| magnetometer | ||
| meter | ||
| resolver | ||
| 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 | ||