drm: Branch 'master'

[<bwi...@ke...>]

 intel/intel_bufmgr_gem.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7d42b49c0cf19dbb4531cd84efae51f95db2eea1
Author: David Shao <da...@gm...>
Date:   Sat Nov 10 00:24:56 2012 -0500

    intel: Fix missing ETIME on BSD operating systems
    
    Originally posted to Free Desktop bug #52549 by David Shao.
    Resolves Gentoo Bug #433403.
    Commit message by Richard Yao.
    
    Reviewed-by: Richard Yao <ry...@ge...>
    Reviewed-by: Kenneth Graunke <ke...@wh...>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=52549
    
    Signed-off-by: Ben Widawsky <be...@bw...>

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8d45839..512bc6f 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -54,6 +54,9 @@
 #include <stdbool.h>
 
 #include "errno.h"
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
 #include "libdrm_lists.h"
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"