Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... 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>		2010-10-28 09:44:56 -07:00
..
accel	staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.	2010-10-08 07:17:56 -07:00
adc	staging: iio: ad7476: fix !CONFIG_IIO_RING_BUFFER build issue reported by Randy Dunlap	2010-10-14 12:09:23 -07:00
Documentation	staging: iio: update example application.	2010-10-08 07:17:57 -07:00
gyro	staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.	2010-10-08 07:17:56 -07:00
imu	staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.	2010-10-08 07:17:56 -07:00
light	staging: iio: light remove empty light.h file	2010-10-08 07:17:56 -07:00
magnetometer
trigger
chrdev.h
iio.h
industrialio-core.c	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
industrialio-ring.c	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
industrialio-trigger.c
Kconfig
Makefile
ring_generic.h	staging: iio: ring_generic: provide IIO_CONST_ATTR_SCAN_EL_TYPE_WITH_SHIFT	2010-10-07 10:07:01 -07:00
ring_hw.h
ring_sw.c
ring_sw.h
sysfs.h	staging: iio: sca3000 event attribute name updates	2010-10-08 07:17:54 -07:00
TODO
trigger.h
trigger_consumer.h