libdrm_intel: fix merge error
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 19 Nov 2008 18:56:48 +0000 (10:56 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 19 Nov 2008 18:56:48 +0000 (10:56 -0800)
commit60c1e3a09e33bfaec893c1d4780553b9b344293a
tree1fa18e0b4621a56f9ed415b19059b235852505c0
parent8f5d8ba97e82072b2403bff0bf836a09640108a6
libdrm_intel: fix merge error

don't take the lock twice
libdrm/intel/intel_bufmgr_gem.c