git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Dave Airlie <airlied@redhat.com>
	Mon, 7 Sep 2009 10:27:20 +0000 (20:27 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 7 Sep 2009 10:27:20 +0000 (20:27 +1000)
commit	1ed96425adc95ff324256e96dd22d732014f0cfb
tree	9e2c33c6249e26b05a2b5db87d4f4840e9049840	tree \| snapshot
parent	b2f96d55710b157a28fa8f92b204ab4f9330a770	commit \| diff
parent	aef6412d8ed9a3171f9ac1097200eec5d5af6143	commit \| diff

Merge intel drm-intel-next branch

Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c

12 files changed:

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/drm_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r100.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r300.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_cp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.h	diff1 \|	diff2 \|	blob \| history