Merge 5.2-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 23 Jun 2019 11:29:03 +0000 (13:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 23 Jun 2019 11:29:03 +0000 (13:29 +0200)
commit90b45399b4418a3542fe096b92840b3bf235e78e
treea75e3e37503be4fe4c7d718248bd5a844c8705e1
parente39956c0d35efc36acbead9fc624a9ffd7d7ab82
parent4b972a01a7da614b4796475f933094751a295a2f
Merge 5.2-rc6 into staging-next

We want the fixes and this resolves a merge issue as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/adc/at91-sama5d2_adc.c
drivers/iio/dac/ds4424.c
drivers/staging/iio/addac/adt7316.c