Greg Kroah-Hartman e2aad1d571 Merge 3.12-rc2 into staging-next. ... This resolves the merge problem with two iio drivers that Stephen Rothwell pointed out. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-09-25 08:59:04 -07:00
..
accel	staging:iio:lis3l02dq: Use iio_push_to_buffers_with_timestamp()	2013-09-21 19:24:00 +01:00
adc	staging:iio:mxs-lradc: Use iio_push_to_buffers_with_timestamp()	2013-09-21 19:24:02 +01:00
addac	staging: iio: replace strict_strto*() with kstrto*()	2013-09-08 15:16:07 +01:00
cdc	staging: iio: ad7746: Use devm_iio_device_alloc	2013-08-28 20:21:34 +01:00
Documentation	iio: staging: fix device.txt documentation	2013-08-03 18:40:32 +01:00
frequency	staging: iio: replace strict_strto*() with kstrto*()	2013-09-08 15:16:07 +01:00
gyro	iio: gyro: adis16060_core: Use devm_iio_device_alloc	2013-08-17 15:50:56 +01:00
impedance-analyzer	staging:iio: Remove unnecessary casts for iio_push_to_buffers()	2013-09-15 19:05:51 +01:00
light	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
magnetometer	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
meter	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
resolver	staging: iio: ad2s90: Use devm_iio_device_alloc	2013-09-14 11:52:01 +01:00
trigger	staging: iio: replace strict_strto*() with kstrto*()	2013-09-08 15:16:07 +01:00
iio_dummy_evgen.c
iio_dummy_evgen.h
iio_simple_dummy.c	staging:iio: dummy driver additions to show shared_by_dir infomask usage	2013-09-15 17:46:33 +01:00
iio_simple_dummy.h
iio_simple_dummy_buffer.c	staging:iio:dummy: Use iio_push_to_buffers_with_timestamp()	2013-09-21 19:24:02 +01:00
iio_simple_dummy_events.c
Kconfig	staging:iio:dummy fix kfifo_buf kconfig dependency issue if kfifo modular and buffer enabled for built in dummy driver.	2013-09-18 19:43:23 +01:00
Makefile
ring_hw.h
TODO