Merge remote branch 'origin/modesetting-101' into modesetting-gem
authorDave Airlie <airlied@linux.ie>
Fri, 25 Jul 2008 22:46:38 +0000 (08:46 +1000)
committerDave Airlie <airlied@linux.ie>
Fri, 25 Jul 2008 22:46:38 +0000 (08:46 +1000)
1  2 
linux-core/drm_lock.c

Simple merge