linux/drivers/iio
Greg Kroah-Hartman cb1f6268ac Merge 3.7-rc3 into staging-next
This resolves the conflict with:
	drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-29 08:37:12 -07:00
..
accel iio: fix spelling of Accelerometer in Kconfig 2012-10-19 16:19:02 +01:00
adc iio: at91_adc: Use devm_kcalloc to allocate arrays 2012-10-19 18:46:37 +01:00
amplifiers iio: amplifiers: New driver for AD8366 Dual-Digital Variable Gain Amplifier 2012-05-14 13:15:39 -07:00
common iio: hid-sensors: Prevent crash during hot-unplug 2012-09-22 10:07:34 +01:00
dac drivers/iio/dac: remove CONFIG_EXPERIMENTAL 2012-10-25 12:02:11 -07:00
frequency iio: frequency: ADF4350: Fix potential reference div factor overflow. 2012-08-16 20:24:33 +01:00
gyro iio: Drop timestamp parameter from buffer store_to callback 2012-09-08 10:14:34 +01:00
light iio: Drop timestamp parameter from buffer store_to callback 2012-09-08 10:14:34 +01:00
magnetometer iio: Drop timestamp parameter from buffer store_to callback 2012-09-08 10:14:34 +01:00
iio_core_trigger.h IIO: Move the core files to drivers/iio 2012-04-25 11:11:38 -07:00
iio_core.h IIO: Move the core files to drivers/iio 2012-04-25 11:11:38 -07:00
industrialio-buffer.c iio: Use strict_strtouint instead of kstrtoul 2012-10-19 18:46:50 +01:00
industrialio-core.c iio: Add a logarithmic fractional value type 2012-10-19 18:46:51 +01:00
industrialio-event.c iio: Use strict_strtouint instead of kstrtoul 2012-10-19 18:46:50 +01: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 iio: Add a logarithmic fractional value type 2012-10-19 18:46:51 +01:00
Kconfig iio: Remove duplicates for light/ in Kconfig and Makefile 2012-10-19 19:44:06 +01:00
kfifo_buf.c iio: Drop timestamp parameter from buffer store_to callback 2012-09-08 10:14:34 +01:00
Makefile iio: Remove duplicates for light/ in Kconfig and Makefile 2012-10-19 19:44:06 +01:00