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

…

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

…

adis16480.c

…

adis_buffer.c

…

adis_trigger.c

…

adis.c

…

Kconfig

…

Makefile

…