x11perf: Changes to 'master'

[Peter Harris]

 x11perf.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit e7917bbec06e5c8e17f07b0eb833602b33111f08
Merge: 5072fb464ffebcd97ec3a33cbff7095c3ec16225 cc84118bd700745f02c65b2d6900e512e4c333af
Author: Peter Harris <pharris at opentext.com>
Date:   Tue Nov 23 14:41:33 2010 -0500

    Merge fixes from git://anongit.freedesktop.org/~peterh/x11perf

commit cc84118bd700745f02c65b2d6900e512e4c333af
Author: Peter Harris <peter.harris at hummingbird.com>
Date:   Mon Oct 29 11:35:22 2007 -0400

    Avoid "rep" calculation overflow.
    
    On today's fast machines, "treps" can easily overflow a 32-bit number.
    Use "long long" to calculate reps.
    
    Signed-off-by: Peter Harris <pharris at opentext.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

commit 17a30e7c65c0b03b71b5b1ac54ae3ba33ae3b42a
Author: Peter Harris <peter.harris at hummingbird.com>
Date:   Mon Oct 29 11:29:32 2007 -0400

    Clamp test time to positive values.
    
    If there is some jitter in the sync time, operations can complete in a
    negative amount of time (confusing both humans and x11perfcomp).
    
    Signed-off-by: Peter Harris <pharris at opentext.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>