glamor: Changes to 'master'

[Dave Airlie]

 src/Makefile.am    |    1 +
 src/glamor_utils.h |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c0729336ae35dcc7e46bcf840d6e9a056d5cdd26
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Dec 29 06:42:30 2012 +0000

    glamor_utils: fix unlikely define use
    
    using a define across a split line expression is failure, compiling
    with warnings shows this up.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

commit c6d9cb1eb4962a15f8bbc869e9fef6d1464165af
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Dec 29 06:42:10 2012 +0000

    glamor: add compiler.h
    
    This is also required for distchecking.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>