Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Tue, 10 Apr 2007 17:45:55 +0000 (10:45 -0700)
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Tue, 10 Apr 2007 17:45:55 +0000 (10:45 -0700)
commit44a8761302888080f1cb6596d4573d88c1746da4
tree851220ca0bdcd7677eda5ea796a4eb5a670bf406
parente114b981bc291049fa6996d487334a408acc1ce2
parent50672adb3142abca743535a8e60c360ef47b2a08
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101

Conflicts:

linux-core/drm_crtc.c - trivial merge
linux-core/drm_crtc.h - trivial merge
linux-core/intel_display.c - crtc_config -> mode_config
shared-core/i915_dma.c - accommodate new init code in i915_init.c
linux-core/Makefile.kernel
linux-core/drm_crtc.c
linux-core/drm_crtc.h
linux-core/intel_display.c
linux-core/intel_lvds.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_init.c