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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 721dfe4 4a3928c)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 26 Feb 2018 14:32:00 +0000 (15:32 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 26 Feb 2018 14:32:00 +0000 (15:32 +0100)
commit	36e9f7203e05090031a5356be043a9be342e383c
tree	27877737c3bb3c00ee9caeece7d671f65cf91252	tree \| snapshot
parent	721dfe4133a9a41e4b4a74e5b41089b7dac8f539	commit \| diff
parent	4a3928c6f8a53fa1aed28ccba227742486e8ddcb	commit \| diff

Merge 4.16-rc3 into staging-next

We want the IIO/Staging fixes in here, and to resolve a merge problem
with the move of the fsl-mc code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c	diff1 \|	\|	blob \| history
drivers/staging/iio/adc/ad7192.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree