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)
We want the fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge