]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72968fd c9fe905)
Merge remote branch 'anholt/drm-intel-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:03:47 +0000 (14:03 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:03:47 +0000 (14:03 +1000)
commit13877a0e6e64a8bcf67bdfd3c416f707af86c628
treed6bba03616d1be6ab9e6d9e92641a6f4047e1e15tree | snapshot
parent72968fdf1c19fe36b86e2f78dde3c493a299e6c5commit | diff
parentc9fe905368a6a4d8c034494033cac32b203e0a75commit | diff
Merge remote branch 'anholt/drm-intel-next' into drm-linus

This merges the upstream Intel tree and fixes up numerous conflicts
due to patches merged into Linus tree later in -rc cycle.

Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/drm_dp_i2c_helper.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_suspend.c
14 files changed:
drivers/char/agp/intel-agp.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_dp_i2c_helper.c diff1 | | blob | history
drivers/gpu/drm/i915/Makefile diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_suspend.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_crt.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp.c diff1 | diff2 | blob | history
include/drm/drm.h diff1 | diff2 | blob | history
include/drm/drmP.h diff1 | diff2 | blob | history
include/drm/drm_crtc.h diff1 | diff2 | blob | history
include/drm/i915_drm.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.