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

[Michel Dänzer]

 configure.ac          |    2 +-
 src/drmmode_display.c |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 99cb8c3faf1a4ce368b7500f17a2a7868c15e8e8
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Nov 12 13:38:14 2015 +0900

    Set version for 7.6.1 release

diff --git a/configure.ac b/configure.ac
index 0ff901b..c024d48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-        [7.6.99],
+        [7.6.1],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-ati])
 
commit 4a2114a717ec8d78cacd8fe158e132d62013faac
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Nov 12 13:32:25 2015 +0900

    Remove duplicate free(output_ids) call
    
    Fixes double-free regression introduced by commit 875ad48e ("Simplify
    drmmode_set_mode_major() and avoid leaking memory.").

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 17e5231..99dc08b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -788,7 +788,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		xf86_reload_cursors(pScrn->pScreen);
 
 done:
-	free(output_ids);
 	if (!ret) {
 		crtc->x = saved_x;
 		crtc->y = saved_y;