Merge 4.15-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 13:46:35 +0000 (14:46 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 13:46:35 +0000 (14:46 +0100)
commitb6a09416e83ffe4eccfb4ef1b91b3b66483fa810
treeb30f266e85047244dcdb47d5afc134e76aec530d
parentdb809859c8cee415293b830e67178f526d1eb2be
parent30a7acd573899fd8b8ac39236eff6468b195ac7d
Merge 4.15-rc6 into char-misc-next

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/android/binder.c
security/Kconfig