Merge 4.5-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Feb 2016 01:34:04 +0000 (17:34 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Feb 2016 01:34:04 +0000 (17:34 -0800)
commit5ba907a949562cd4839b0170a13dda6841055e70
tree32d7ab834753779d3e1216a3a251c8c2fb097438
parentabb4f8addf1d55f3a63ac84e3d9f609f97e5b9a0
parent388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95
Merge 4.5-rc3 into staging-next

We want the upstream staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/accel/Kconfig
drivers/iio/adc/Kconfig
drivers/iio/dac/mcp4725.c
drivers/iio/humidity/dht11.c
drivers/iio/pressure/mpl115.c