Greg Kroah-Hartman 0c9e98af5e Merge Linux 3.0-rc6 into staging-next ... This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-07-05 07:35:09 -07:00
..
accel	Merge Linux 3.0-rc6 into staging-next	2011-07-05 07:35:09 -07:00
adc	Staging: iio: dereferencing uninitialized variable	2011-06-28 14:48:13 -07:00
addac	staging:iio:addac:adt7316: allocate chip state with iio_dev and use iio_priv to access.	2011-06-28 14:39:42 -07:00
dac	iio: dac: New driver for AD5686R, AD5685R, AD5684R Digital to analog converters	2011-06-28 14:47:26 -07:00
dds	staging:iio:dds:ad9951: allocate chip state with iio_dev	2011-06-28 14:39:46 -07:00
Documentation	staging:iio:documenation partial update.	2011-05-19 16:15:06 -07:00
gyro	Merge Linux 3.0-rc6 into staging-next	2011-07-05 07:35:09 -07:00
imu	Staging: fix more iio builds when IIO_RING_BUFFER is not enabled	2011-06-27 14:19:20 -07:00
light	iio: light sensor: Add SMBUS support to the tsl2563 driver.	2011-06-28 14:52:25 -07:00
magnetometer	staging:iio:magnetometer:hmc5843: allocate device state with iio_dev.	2011-06-28 14:39:51 -07:00
meter	staging:iio:meter:ade7759: allocate state with iio_dev	2011-06-28 14:39:51 -07:00
resolver	staging:iio:resolver:ad2s90 general cleanup	2011-06-28 14:39:50 -07:00
trigger	staging: IIO corrected the spelling in iio-trig-gpio	2011-06-28 14:39:52 -07:00
chrdev.h	staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.	2011-05-19 16:15:04 -07:00
iio.h	iio: industrialio-core: Add IIO_OUT type	2011-06-28 14:47:25 -07:00
industrialio-core.c	iio: industrialio-core: Add IIO_OUT type	2011-06-28 14:47:25 -07:00
industrialio-ring.c	staging:iio: ring core cleanups + check if read_last available in lis3l02dq	2011-05-19 16:15:05 -07:00
industrialio-trigger.c	iio: trigger: Add filter callback	2011-06-28 14:39:33 -07:00
Kconfig	Staging: iio: Make IIO depend on GENERIC_HARDIRQS	2011-06-27 14:19:21 -07:00
kfifo_buf.c	staging:iio: rationalization of different buffer implementation hooks.	2011-05-19 16:15:03 -07:00
kfifo_buf.h	staging:iio: rationalization of different buffer implementation hooks.	2011-05-19 16:15:03 -07:00
Makefile
ring_generic.h	staging:iio: ring core cleanups + check if read_last available in lis3l02dq	2011-05-19 16:15:05 -07:00
ring_hw.h
ring_sw.c	staging:iio: Rip out helper for software rings.	2011-05-19 16:15:03 -07:00
ring_sw.h	staging:iio: Rip out helper for software rings.	2011-05-19 16:15:03 -07:00
sysfs.h	staging:iio:buffer - remove unused event code for buffer events.	2011-05-19 16:15:01 -07:00
TODO
trigger.h	iio: trigger: Add filter callback	2011-06-28 14:39:33 -07:00
trigger_consumer.h