Merge 3.15-rc6 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)
commit69c1f05379a34786da96d0fdedc111cdcdecdf6f
tree74a0cde11fbc619c227af89e0757036ab20323d0
parent007dfe5ad6d039df784b44285bae89654eab3258
parent4b660a7f5c8099d88d1a43d8ae138965112592c7
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>
MAINTAINERS
drivers/iio/adc/Kconfig
drivers/iio/adc/exynos_adc.c
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c