Merge char-misc-next into staging-next

This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/platform/goldfish/goldfish_pipe.c
index 9f6734ce1873c8143664d08a9342bd807fe1fd3a,839df4aace764631ab9b0599ab08460e73f465cb..9973cebb4d6fe7ac98e8551f35b4ca459d8f7c25
--- 1/drivers/platform/goldfish/goldfish_pipe.c
--- 2/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@@ -57,7 -58,8 +58,9 @@@
  #include <linux/slab.h>
  #include <linux/io.h>
  #include <linux/goldfish.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/mm.h>
+ #include <linux/acpi.h>
  
  /*
   * IMPORTANT: The following constants must match the ones used and defined