Merge remote branch 'origin/modesetting-101' into modesetting-gem
authorDave Airlie <airlied@redhat.com>
Wed, 9 Jul 2008 04:53:47 +0000 (14:53 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 9 Jul 2008 04:53:47 +0000 (14:53 +1000)
commit2556341f8baf0e0b7b5f7843135e43e662751af0
tree84b591787aa036959e56c490b38dbf9e191c76dd
parent38a5f6686cd38d5204e240f30006538bcf70f5ac
parent0b7d9a97bd2383fe4382fc1b1b266542020f0c4e
Merge remote branch 'origin/modesetting-101' into modesetting-gem
13 files changed:
linux-core/Makefile
linux-core/Makefile.kernel
linux-core/drm_crtc_helper.c
linux-core/drm_drv.c
linux-core/dvo_ch7xxx.c
linux-core/dvo_ivch.c
linux-core/dvo_tfp410.c
linux-core/intel_crt.c
linux-core/intel_display.c
linux-core/intel_fb.c
linux-core/intel_lvds.c
linux-core/intel_tv.c
shared-core/drm.h