Greg Kroah-Hartman 829455bb0e Merge 3.10-rc3 into staging-next ... We want the changes here, and we resolve the merge conflict that was happening in the nvec_kbd.c file. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-05-27 10:54:33 +09:00
..
accel	iio: STMicroelectronics: remove three useless selects	2013-05-22 22:16:49 +01:00
adc	Merge 3.10-rc3 into staging-next	2013-05-27 10:54:33 +09:00
amplifiers	iio:amplifiers:ad8366 move to info_mask_(shared_by_type/separate)	2013-03-17 19:49:30 +00:00
common	iio:common:st: added disable function after read info raw data	2013-05-22 22:14:58 +01:00
dac	iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m	2013-05-22 22:14:58 +01:00
frequency	iio:freq:ad9523 move to info_mask_(shared_by_type/separate)	2013-03-17 19:49:34 +00:00
gyro	iio: STMicroelectronics: remove three useless selects	2013-05-22 22:16:49 +01:00
imu	iio:trigger: Introduce iio_tigger_{set,get}_drvdata	2013-03-25 21:06:09 +00:00
light	iio: Correct HID light sensor name in comments	2013-05-22 22:16:49 +01:00
magnetometer	iio: STMicroelectronics: remove three useless selects	2013-05-22 22:16:49 +01:00
trigger	iio:trigger:sysfs Move out of staging.	2013-05-22 22:16:48 +01:00
buffer_cb.c	iio: Update iio_channel_get_all and iio_channel_get_all_cb API	2013-02-02 11:58:46 +00: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: Add OF support	2013-03-16 10:17:59 +00:00
industrialio-buffer.c	iio: buffer: cleanup messages in iio_update_buffers()	2013-05-22 22:16:47 +01:00
industrialio-core.c	iio:core drop info_mask from struct iio_info	2013-03-17 19:49:44 +00:00
industrialio-event.c	iio: events: Make iio_push_event() IRQ context save	2013-03-17 20:04:45 +00:00
industrialio-trigger.c	iio: tweak language in industrialio-trigger comments	2013-02-06 18:40:05 +00: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 OF support	2013-03-16 10:17:59 +00:00
Kconfig	iio:trigger:sysfs Move out of staging.	2013-05-22 22:16:48 +01:00
kfifo_buf.c	staging:iio: Remove noop call to __iio_update_buffer	2013-01-31 17:56:44 +00:00
Makefile	iio:trigger:sysfs Move out of staging.	2013-05-22 22:16:48 +01:00