drm: Branch 'master'

 intel/intel_bufmgr_fake.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 42f2f92059dca568e896aee93126b8bef2a332a1
Author: Chih-Wei Huang <[email protected]>
Date:   Fri Oct 30 11:49:42 2015 +0800

    intel: add the missing <strings.h> include
    
    It defines the prototype of ffs that fixes the building error
    on Android 6.0 64-bit image.
    
    Signed-off-by: Chih-Wei Huang <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c
index 551e05d..7f4c7b9 100644
--- a/intel/intel_bufmgr_fake.c
+++ b/intel/intel_bufmgr_fake.c
@@ -42,6 +42,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+#include <strings.h>
 #include <xf86drm.h>
 #include <pthread.h>
 #include "intel_bufmgr.h"

------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
--