Greg Kroah-Hartman 6a2a2cdd57 Merge 3.6-rc6 into staging-next ... This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-09-16 17:17:25 -07:00
..
accel	iio: Drop timestamp parameter from buffer store_to callback	2012-09-08 10:14:34 +01:00
adc	Merge 3.6-rc6 into staging-next	2012-09-16 17:17:25 -07: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: Common attribute and trigger	2012-09-06 19:20:11 +01:00
dac	iio:ad5446: Add device ids for ad5301/ad5311/ad5321	2012-09-08 10:14:46 +01: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_core.h
industrialio-buffer.c	iio: Drop timestamp parameter from buffer store_to callback	2012-09-08 10:14:34 +01:00
industrialio-core.c	iio: core: Add hysteresis in channel spec	2012-09-06 19:04:45 +01:00
industrialio-event.c	iio: Fix unitialized use of list	2012-07-08 20:02:24 +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: use IIO_CHAN_INFO_RAW rather than 0	2012-08-27 18:24:45 +01:00
Kconfig	iio: hid-sensors: Added ALS	2012-09-06 19:24:15 +01:00
kfifo_buf.c	iio: Drop timestamp parameter from buffer store_to callback	2012-09-08 10:14:34 +01:00
Makefile	iio: hid-sensors: Added ALS	2012-09-06 19:24:15 +01:00