OSDN Git Service

Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Tue, 17 Apr 2007 17:14:18 +0000 (10:14 -0700)
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Tue, 17 Apr 2007 17:14:18 +0000 (10:14 -0700)
commit1c7f895fa6531b16e7e9fd4568d4f6a50ca5711e
treeb46163c3b5f98e18d3ad1c70c095d77fc71721e6
parent4e4d9cbeb3f52b605e46aad8ae1a947ca236079f
parentb729b919baed250313caf3f0bbd4044e084de8bf
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101

Conflicts:

shared-core/i915_init.c - reconcile with airlied's new code
linux-core/drm_crtc.c
linux-core/drm_crtc.h
linux-core/drm_objects.h
shared-core/i915_drv.h
shared-core/i915_init.c