Greg Kroah-Hartman 17cb3be61b Merge branch 'staging-linus' into staging-next ... This is to get the comedi fixes, and resolve the issue in comdi_test.c and comedi_fops.c that were caused by changes in both branches. It also allows the fwserial driver changes to be applied, as they required the fixes that are in staging-linus. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-01-07 15:17:52 -08:00
..
accel	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
adc	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
amplifiers	iio: amplifiers: New driver for AD8366 Dual-Digital Variable Gain Amplifier	2012-05-14 13:15:39 -07:00
common	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
dac	iio: dac: ad5446: Don't set error code to voltage_uv	2012-12-27 11:00:27 +00:00
frequency	iio:adf4350: Fix typo	2012-12-27 10:59:29 +00:00
gyro	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
imu	iio: imu: adis16480: remove duplicated include from adis16480.c	2012-11-30 13:11:46 +00:00
light	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
magnetometer	Merge branch 'staging-linus' into staging-next	2013-01-07 15:17:52 -08:00
buffer_cb.c	staging:iio: add a callback buffer for in kernel push interface	2012-11-10 10:17:27 +00:00
iio_core_trigger.h
iio_core.h
industrialio-buffer.c	staging:iio: Add support for multiple buffers	2012-11-10 10:17:21 +00:00
industrialio-core.c	iio: Factor out fixed point number parsing into its own function	2012-11-20 21:26:39 +00:00
industrialio-event.c	drivers/iio/industrialio-event.c: eliminate possible double free	2012-11-17 10:17:20 +00:00
industrialio-trigger.c	iio:trigger: Register sysfs file statically	2012-07-08 10:39:58 +01:00
industrialio-triggered-buffer.c	iio: Add helper function for initializing triggered buffers	2012-06-18 17:26:09 -07:00
inkern.c	staging:iio:in kernel users: Add a data field for channel specific info.	2012-11-10 10:17:27 +00:00
Kconfig	staging:iio: Move adis library out of staging	2012-11-19 22:22:12 +00:00
kfifo_buf.c	iio: Drop timestamp parameter from buffer store_to callback	2012-09-08 10:14:34 +01:00
Makefile	staging:iio: Move adis library out of staging	2012-11-19 22:22:12 +00:00