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_mpu_core.c

Merge 3.15-rc6 into staging-next.

2014-05-22 23:27:17 +09:00

inv_mpu_iio.h

iio: imu: inv_mpu6050: Add compatibity with MPU6500

2014-03-29 10:45:09 +00:00

inv_mpu_ring.c

…

inv_mpu_trigger.c

…

Kconfig

iio: imu: inv_mpu6050: Add compatibity with MPU6500

2014-03-29 10:45:09 +00:00

Makefile

…