xserver: Branch 'master'

[Eric Anholt]

 glamor/glamor_picture.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1f5f9022f31ca4d662cc125fa80cb25386da6d1
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Sep 27 18:41:35 2015 -0700

    glamor: Get rid of an extraneous ; at the end of a C source line
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c
index 691f179..9b09454 100644
--- a/glamor/glamor_picture.c
+++ b/glamor/glamor_picture.c
@@ -231,7 +231,7 @@ glamor_get_tex_format_type_from_pictformat_gles2(PictFormatShort format,
     case PICT_b5g6r5:
         *tex_format = GL_RGB;
         *tex_type = GL_UNSIGNED_SHORT_5_6_5;
-        need_swap_rb = IS_LITTLE_ENDIAN ? 1 : 0;;
+        need_swap_rb = IS_LITTLE_ENDIAN ? 1 : 0;
         break;
 
     case PICT_x1b5g5r5: