git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Dave Airlie <airlied@redhat.com>
	Tue, 4 Jan 2011 22:31:08 +0000 (08:31 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 4 Jan 2011 22:31:08 +0000 (08:31 +1000)
commit	4f125010d2d02c481a0fdf5aee23a9f937bc5de1
tree	dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57	tree \| snapshot (tar.gz zip)
parent	204663c48711ddceee09df46269cd34d49d1f7be	commit \| diff
parent	989d873fc5b6a96695b97738dea8d9f02a60f8ab	commit \| diff

Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

12 files changed:

drivers/gpu/drm/drm_crtc_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreend.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_fb.c	diff1 \|	diff2 \|	blob \| history