xf86-video-ati: Branch 'master' - 2 commits

[Michel Dänzer]

 configure.ac      |    2 +-
 src/radeon_dri3.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bd4c72c8625996d842824ce4963f2d759fe2954a
Author: Tom St Denis <tom.stdenis at amd.com>
Date:   Fri Apr 8 10:22:11 2016 -0400

    dri3: Return NULL from radeon_dri3_pixmap_from_fd if calloc fails.
    
    Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c
index 43a073b..c567024 100644
--- a/src/radeon_dri3.c
+++ b/src/radeon_dri3.c
@@ -144,6 +144,7 @@ static PixmapPtr radeon_dri3_pixmap_from_fd(ScreenPtr screen,
 			}
 
 			screen->DestroyPixmap(pixmap);
+			return NULL;
 		}
 	}
 #endif
commit 3300ea01fbdf770dc084eebbf2854fba35144220
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Apr 11 16:11:57 2016 +0900

    Post 7.7.0 release version bump

diff --git a/configure.ac b/configure.ac
index 48e314b..394f45a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-        [7.7.0],
+        [7.7.99],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-ati])