xf86-video-cyrix: Changes to 'master'

[Jeremy Huddleston]

 src/cyrix.h        |    2 +-
 src/cyrix_driver.c |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4cf15cbff44217d0ef50fc9b2b1ace936becd010
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Oct 16 15:12:54 2011 -0700

    Fix a couple of compilation errors.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

commit 3a26fe8fcef9ce36036de58570ab0b0f268ae596
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Oct 16 15:10:57 2011 -0700

    Use malloc/calloc/realloc/free directly
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>