Merge remote branch 'origin/master' into modesetting-gem
authorDave Airlie <airlied@redhat.com>
Fri, 26 Sep 2008 05:37:21 +0000 (15:37 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 30 Sep 2008 04:13:49 +0000 (14:13 +1000)
commit972f6572652bc4a2f6c44c525e5e91f2becdb62a
tree60af3dc7e8a7c0f8bef7a3927dae161093b10dbe
parent89126bb58ec82511758bed36a28e698b721fb435
parent2db8e0c8ef8c7a66460fceda129533b364f6418c
Merge remote branch 'origin/master' into modesetting-gem

Conflicts:

libdrm/Makefile.am
libdrm/dri_bufmgr.h
linux-core/drm_irq.c
linux-core/drm_sysfs.c
linux-core/drm_ttm.c
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/nouveau_drv.h
shared-core/radeon_cp.c
19 files changed:
libdrm/Makefile.am
libdrm/intel/intel_bufmgr_fake.c
libdrm/intel/intel_bufmgr_gem.c
libdrm/xf86drm.c
linux-core/Makefile
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/drm_memory.c
linux-core/drm_sysfs.c
shared-core/Makefile.am
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_init.c
shared-core/i915_irq.c
shared-core/nouveau_drv.h
shared-core/nouveau_state.c
shared-core/radeon_cp.c
tests/Makefile.am