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	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
adc	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
amplifiers	iio: amplifiers: ad8366: Use devm_* APIs	2013-08-03 21:00:15 +01:00
common	iio: sensors-core: st: Clean-up error handling in st_sensors_read_axis_data()	2013-09-21 19:24:04 +01:00
dac	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
frequency	iio: refactor info mask and ext_info attribute creation.	2013-09-15 17:43:20 +01:00
gyro	iio:gyro: Register buffer also without specific trigger	2013-09-21 19:24:08 +01:00
imu	iio:mpu6050: Use iio_push_to_buffers_with_timestamp()	2013-09-21 19:23:58 +01:00
light	First round of new drivers, functionality and cleanups for IIO in the 3.13 cycle	2013-09-22 11:30:12 -07:00
magnetometer	iio:magn: Register buffer also without specific trigger	2013-09-21 19:24:08 +01:00
pressure	iio:press: Register buffer also without specific trigger	2013-09-21 19:24:09 +01:00
temperature	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
trigger	iio: Add a comment to about alphabetical order to Kconfigs and Makefiles	2013-08-03 18:40:36 +01:00
buffer_cb.c	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
iio_core_trigger.h	iio: fix semicolon in io_core_trigger.h	2013-08-03 18:40:32 +01:00
iio_core.h	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
industrialio-buffer.c	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
industrialio-core.c	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
industrialio-event.c	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
industrialio-trigger.c	iio: trigger: implement devm_iio_trigger_alloc/devm_iio_triger_free	2013-08-17 19:34:52 +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: inkern: fix iio_convert_raw_to_processed_unlocked	2013-07-03 20:30:52 +01:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
kfifo_buf.c	iio: iio_push_to_buffers(): Change type of 'data' to const void *	2013-09-15 19:02:07 +01:00
Makefile	iio: Restore alphabetic order in Makefile	2013-08-17 15:50:54 +01:00