Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@tungstengraphics.com>
Thu, 21 Feb 2008 11:37:07 +0000 (11:37 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Thu, 21 Feb 2008 11:37:07 +0000 (11:37 +0000)
commitea3de6daa4226cdcc4b50c339e0df6130014d2fe
tree097d8da67aff49eae70dd86359621e1901c9bc5b
parent3f6c8f64aa8c3a9e427d453433e828693fb4e017
parent374b41e5bcdb5c22471c8c16dd794ac54c4f76d2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

linux-core/drm_sysfs.c
linux-core/drmP.h
linux-core/drm_irq.c
linux-core/drm_sysfs.c
linux-core/i915_drv.c