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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b5390f4 d139371)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 11 Feb 2019 08:05:58 +0000 (09:05 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 11 Feb 2019 08:05:58 +0000 (09:05 +0100)
commit	5c07488d996b6b2af609f351bf54c9909ed0fdf8
tree	62cc2522698d7383cdf4a4f450bde30bc45f1832	tree \| snapshot
parent	b5390f4b5e0b75634c7f08c88e97b5fe0e833599	commit \| diff
parent	d13937116f1e82bf508a6325111b322c30c85eb9	commit \| diff

Merge 5.0-rc6 into char-misc-next

We need the char-misc fixes in here as well.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/mic/vop/vop_main.c	diff1 \|	diff2 \|	blob \| history
kernel/events/ring_buffer.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree