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)
commit31da9492a4129f5255e949836c51e9dfbfb270c4
tree49011a044045a25c44c64e7447643702f8be31ce
parent11d30750873260fe19498d90831f07079dfad5d8
parent7fd7ba87f35aa4881e99b95bab4151b3f9db9b8e
Merge remote branch 'origin/modesetting-101' into modesetting-gem
linux-core/drm_lock.c