review.tizen.org Git - platform/upstream/libdrm.git/commit

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8fd8bf5 5dc5c36)

author	Dave Airlie <airlied@redhat.com>
	Thu, 22 Nov 2007 06:17:06 +0000 (17:17 +1100)
committer	Dave Airlie <airlied@redhat.com>
	Thu, 22 Nov 2007 06:17:06 +0000 (17:17 +1100)
commit	a20587e3950f849deb1e723a0b4455a19f7b3fb8
tree	de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24	tree \| snapshot
parent	8fd8bf599b42b6caa062afabdfce7385d59a7695	commit \| diff
parent	5dc5c36e624e5393b5427a159ad34e5fc358cc9f	commit \| diff

Merge branch 'origin' into modesetting-101

Conflicts:

linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h

14 files changed:

linux-core/ati_pcigart.c	diff1 \|	diff2 \|	blob \| history
linux-core/drmP.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_bufs.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_drv.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_fops.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_stub.c	diff1 \|	diff2 \|	blob \| history
shared-core/drm.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_dma.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drm.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drv.h	diff1 \|	diff2 \|	blob \| history
shared-core/radeon_cp.c	diff1 \|	diff2 \|	blob \| history
shared-core/radeon_drm.h	diff1 \|	diff2 \|	blob \| history
shared-core/radeon_drv.h	diff1 \|	diff2 \|	blob \| history
shared-core/radeon_irq.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;