]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge 5.1-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:18:44 +0000 (23:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:18:44 +0000 (23:18 +0200)
We want the fixes in here as well as this resolves an iio driver merge
issue.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
16 files changed:
1  2 
.mailmap
MAINTAINERS
drivers/iio/accel/kxcjk-1013.c
drivers/iio/adc/ad_sigma_delta.c
drivers/iio/chemical/Kconfig
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
drivers/iio/gyro/bmg160_core.c
drivers/iio/gyro/mpu3050-core.c
drivers/iio/industrialio-buffer.c
drivers/iio/industrialio-core.c
drivers/staging/comedi/drivers/ni_usb6501.c
drivers/staging/erofs/data.c
drivers/staging/iio/adc/ad7192.c
drivers/staging/iio/meter/ade7854.c
drivers/staging/most/core.c
drivers/tty/vt/vt.c

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge