mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i915/intel_context.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit ffa8b18c7cce5041d2006e669fe633156a6b2d05
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 14 15:19:43 2008 -0800

    [i915] Fix recursive lock hang in intelContendedLock handling.