libX11: Changes to 'master'

[Keith Packard]

 src/locking.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a4c591ced5cac9301b9abfa0e521be2d0b267882
Author: Keith Packard <keithp at keithp.com>
Date:   Sun Mar 4 02:00:13 2012 -0800

    Block for other threads in _XUserLockDisplay
    
    Wait for all other threads to release the user-level lock when
    acquiring it. This ensures that only one thread at a time holds the
    user-level lock, necessary as it is a nesting lock and a single
    variable is used to determine when the lock is nesting and when it is
    contended.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>