Greg Kroah-Hartman 69c1f05379 Merge 3.15-rc6 into staging-next. ... This resolves the conflicts in the files: drivers/iio/adc/Kconfig drivers/staging/rtl8723au/os_dep/usb_ops_linux.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-05-22 23:27:17 +09:00
..
inv_mpu6050	Merge 3.15-rc6 into staging-next.	2014-05-22 23:27:17 +09:00
adis16400_buffer.c	iio:adis16400: Use iio_push_to_buffers_with_timestamp()	2013-09-21 19:23:57 +01:00
adis16400_core.c	First set of new drivers and cleanups for IIO in the 3.15 cycle.	2014-02-11 14:12:12 -08:00
adis16400.h	iio: adis16400: Set timestamp as the last element in chan_spec	2014-02-08 11:26:06 +00:00
adis16480.c	iio: imu: adis16480: Use devm_iio_device_alloc	2013-08-03 18:55:24 +01:00
adis_buffer.c	iio:adis_lib: Use iio_push_to_buffers_with_timestamp()	2013-09-21 19:23:57 +01:00
adis_trigger.c
adis.c
Kconfig	iio: imu: mpu6050: Move config entry into IMU menu	2014-02-08 12:27:30 +00:00
Makefile	iio: Add a comment to about alphabetical order to Kconfigs and Makefiles	2013-08-03 18:40:36 +01:00