From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Feb 2016 22:46:24 +0000 (-0800)
Subject: Merge char-misc-next into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bb27d4998a9e8767674e8eda225c82cc149e5bc8;p=linux.git

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>
---

bb27d4998a9e8767674e8eda225c82cc149e5bc8
diff --cc drivers/platform/goldfish/goldfish_pipe.c
index 9f6734ce1873c,839df4aace764..9973cebb4d6fe
--- a/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