c8d1a12692
Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). 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.h | ||
| trigger_consumer.h | ||