OSDN Git Service

Merge commit 'origin/master' into modesetting-gem
authorKristian Høgsberg <krh@redhat.com>
Thu, 31 Jul 2008 19:18:32 +0000 (15:18 -0400)
committerKristian Høgsberg <krh@redhat.com>
Thu, 31 Jul 2008 19:18:32 +0000 (15:18 -0400)
commit5052e966ec7fe5146c2d73b90482003619add5da
treea48e771871fd64a2892f5ce75e6e309b03db5e06
parent6d4e147480a334d32fa59c7fde53e10d7ab6e106
parent95c02743c96ca9e959f68a6e942206bdfadae53a
Merge commit 'origin/master' into modesetting-gem

Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
21 files changed:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_irq.c
linux-core/drm_memory.c
linux-core/i915_drv.c
linux-core/i915_opregion.c
linux-core/radeon_drv.c
linux-core/radeon_reg.h
shared-core/drm.h
shared-core/drm_pciids.txt
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_init.c
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/r300_cmdbuf.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
shared-core/radeon_irq.c