Merge 4.3-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Oct 2015 00:13:38 +0000 (09:13 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Oct 2015 00:13:38 +0000 (09:13 +0900)
commitcf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed
treea56d5024a453bb323039f7c481ac17738269e24f
parent047e6646579c2853afba0111f573796daf4fd485
parent32b88194f71d6ae7768a29f87fbba454728273ee
Merge 4.3-rc7 into staging-next

We want the other staging patches in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/accel/st_accel_core.c
drivers/staging/iio/accel/sca3000_ring.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/lustre/lustre/llite/dir.c