git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7dc7967 085b775)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sun, 21 Apr 2019 21:18:44 +0000 (23:18 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sun, 21 Apr 2019 21:18:44 +0000 (23:18 +0200)
commit	817de6b85914a3dda72b971c074d4d342965fba0
tree	df0a4563a04aadb8f8595f72392d66d65797c455	tree \| snapshot
parent	7dc7967fc39af81191558f63eeaf3d2b83899b1c	commit \| diff
parent	085b7755808aa11f78ab9377257e1dad2e6fa4bb	commit \| diff

Merge 5.1-rc6 into staging-next

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:

.mailmap	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/kxcjk-1013.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad_sigma_delta.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/chemical/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/gyro/bmg160_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/gyro/mpu3050-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_usb6501.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/erofs/data.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/ad7192.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/meter/ade7854.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/most/core.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/vt/vt.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree