Merge 4.14-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Oct 2017 15:21:44 +0000 (17:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Oct 2017 15:21:44 +0000 (17:21 +0200)
commit6fbf248a20d362a92de60beee9474faca0b54eee
treeb5365be73b420be3b6036fb40aaf1b167c90b180
parentde4ce2d1ad1bb3304d4107160c9551b7fd8d8ec5
parentbb176f67090ca54869fc1262c913aa69d2ede070
Merge 4.14-rc6 into char-misc-next

We want the driver fixes in here and this resolves a merge issue with
the binder driver.

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