Merge branch 'modesetting-airlied' into modesetting-101
authorDave Airlie <airlied@redhat.com>
Tue, 18 Dec 2007 08:18:21 +0000 (19:18 +1100)
committerDave Airlie <airlied@redhat.com>
Tue, 18 Dec 2007 08:18:21 +0000 (19:18 +1100)
commit629231c62675fe09f4eb948861a21980a9b79a5a
tree097ebcbb9f305fdac4cb3ebc15ef89bb8cea20fd
parentea915c77e169a50ca7dc557512212eafa93e2205
parent6d03411e5faa124bac014ebacec470ffd7cf2ce4
Merge branch 'modesetting-airlied' into modesetting-101
linux-core/drm_bo.c
linux-core/drm_crtc.c
linux-core/drm_crtc.h
linux-core/intel_crt.c
linux-core/intel_sdvo.c
shared-core/i915_init.c