Merge 4.6-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 11:20:04 +0000 (13:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 11:20:04 +0000 (13:20 +0200)
commit4096e645d85d575e7b6e699f470f5519c34fda5d
tree9cfb8e2c1a816e2f7142d20b79c578fdf69dd2f2
parenta0ca97b808c06793fd9dfb69243ce945c9fff501
parent44549e8f5eea4e0a41b487b63e616cb089922b99
Merge 4.6-rc7 into staging-next

This fixes some merge issues with some iio drivers that were found in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/gpu/drm/i915/i915_drv.h
drivers/iio/adc/at91-sama5d2_adc.c
drivers/iio/magnetometer/ak8975.c