linux/drivers/staging/iio
Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version
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>
2010-05-21 12:48:55 -07:00
..
accel Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
adc Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
Documentation staging: iio: Documentation update to add incli and switch to magn 2010-05-11 14:33:24 -07:00
gyro staging: iio: adis16260 digital gyro driver 2010-05-14 13:20:35 -07:00
imu staging: iio: adis16350 and similar IMU driver 2010-05-18 14:44:28 -07:00
light Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
magnetometer staging: iio: Break up gyro.h and move to new abi 2010-05-11 14:33:24 -07:00
trigger Staging: iio: trigger: fix up some global variables 2010-05-11 11:36:10 -07:00
chrdev.h staging:iio: Directory name changes to match new ABI. 2010-05-11 11:36:05 -07:00
iio.h staging: iio: Move from class to bus 2010-05-11 11:36:05 -07:00
industrialio-core.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
industrialio-ring.c Staging: iio: industrialio-ring.c: fix up sparse warnings 2010-05-11 11:36:11 -07:00
industrialio-trigger.c Staging: iio: industrialio-trigger.c: minor fixups 2010-05-11 11:36:11 -07:00
Kconfig staging: iio: adis16260 digital gyro driver 2010-05-14 13:20:35 -07:00
Makefile staging: iio: adis16260 digital gyro driver 2010-05-14 13:20:35 -07:00
ring_generic.h staging:iio: Remove naming via IDR's where no longer necessary under new abi. 2010-05-11 11:36:06 -07:00
ring_hw.h
ring_sw.c Staging: iio: ring_sw.c: fix up sparse warnings 2010-05-11 11:36:11 -07:00
ring_sw.h
sysfs.h staging:iio: Add new attrs for sampling frequency available and temp_raw 2010-05-11 11:36:04 -07:00
TODO
trigger_consumer.h
trigger.h