Merge remote branch 'origin/modesetting-101' into modesetting-gem
authorDave Airlie <airlied@linux.ie>
Fri, 25 Jul 2008 22:38:59 +0000 (08:38 +1000)
committerDave Airlie <airlied@linux.ie>
Fri, 25 Jul 2008 22:38:59 +0000 (08:38 +1000)
commitfb05c4d621084d7a3fb3dd52d7d9c888eac852d0
treebca43a3c777984e0eb962d55817541801377d3c4
parent2556341f8baf0e0b7b5f7843135e43e662751af0
parent53428453758621da70d9608c9baec58b4b9383ec
Merge remote branch 'origin/modesetting-101' into modesetting-gem
linux-core/drm_crtc_helper.c
linux-core/drm_drv.c
linux-core/intel_crt.c
linux-core/intel_tv.c
shared-core/drm.h