xserver: Branch 'master'

[Adam Jackson]

 randr/rrcrtc.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit e98b36bc69d805ab52aba95b070a614427d46e05
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Dec 8 16:22:16 2015 -0500

    randr: Silence unused variable warning
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index ec26fcd..566a3db 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -383,7 +383,6 @@ rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) {
 void
 RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc)
 {
-    ScreenPtr master = crtc->pScreen->current_master;
     rrScrPriv(crtc->pScreen);
 
     pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL);