Greg Kroah-Hartman 8deab4754c staging: iio: fix up merge error ... Fix up a build merge error in drivers/iio/accel/bma180.c that I caused. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-09-22 07:54:10 -07:00
..
accel	staging: iio: fix up merge error	2014-09-22 07:54:10 -07:00
adc	Merge 3.17-rc6 into staging-next.	2014-09-22 07:30:03 -07:00
amplifiers
common	Merge 3.17-rc6 into staging-next.	2014-09-22 07:30:03 -07:00
dac	iio: add support of the max5821	2014-07-27 14:21:35 +01:00
frequency
gyro	Merge 3.17-rc6 into staging-next.	2014-09-22 07:30:03 -07:00
humidity	iio: remove .owner field for driver using module_platform_driver	2014-08-26 21:08:38 +01:00
imu	Merge 3.17-rc6 into staging-next.	2014-09-22 07:30:03 -07:00
light	iio: Add Dyna-Image AL3320A ambient light sensor driver	2014-09-10 20:25:56 +01:00
magnetometer	Merge 3.17-rc6 into staging-next.	2014-09-22 07:30:03 -07:00
orientation	iio: remove .owner field for driver using module_platform_driver	2014-08-26 21:08:38 +01:00
pressure	iio: remove .owner field for driver using module_platform_driver	2014-08-26 21:08:38 +01:00
proximity
temperature
trigger	iio: remove .owner field for driver using module_platform_driver	2014-08-26 21:08:38 +01:00
buffer_cb.c
iio_core_trigger.h
iio_core.h
industrialio-buffer.c	1st round of new IIO drivers, functionality and cleanups for the 3.18 cycle.	2014-08-25 11:09:35 -07:00
industrialio-core.c	iio: types: Added support for rotation from north usage attributes	2014-07-20 13:34:45 +01:00
industrialio-event.c	Staging driver patches for 3.17-rc1	2014-08-04 18:36:12 -07:00
industrialio-trigger.c
industrialio-triggered-buffer.c
inkern.c	iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name	2014-08-25 16:55:28 +01:00
Kconfig
kfifo_buf.c
Makefile