Merge 4.15-rc3 into char-misc-next

author Greg Kroah-Hartman <[email protected]>

Mon, 11 Dec 2017 07:47:41 +0000 (08:47 +0100)

committer Greg Kroah-Hartman <[email protected]>

Mon, 11 Dec 2017 07:47:41 +0000 (08:47 +0100)
author Greg Kroah-Hartman <[email protected]>
Mon, 11 Dec 2017 07:47:41 +0000 (08:47 +0100)
committer Greg Kroah-Hartman <[email protected]>
Mon, 11 Dec 2017 07:47:41 +0000 (08:47 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/android/binder.c
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 11 Dec 2017 07:47:41 +0000 (08:47 +0100)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 11 Dec 2017 07:47:41 +0000 (08:47 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	patch \|	diff1 \|	diff2 \|	blob \| history