]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b571d3c 54b53f8)
Merge remote branch 'origin/master' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Fri, 7 May 2010 21:30:03 +0000 (14:30 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 10 May 2010 20:36:52 +0000 (13:36 -0700)
commit46d929bb2838aa3ded62d0feff6c4efd5951e610
tree056402a4afc2b7ef2f4dee30a712ce847279c13atree | snapshot
parentb571d3c29b50e2f887f5fe70e054a5cc5ccab2ebcommit | diff
parent54b53f859b86edda1cd0b997f0615da697635dc7commit | diff
Merge remote branch 'origin/master' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
16 files changed:
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_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_irq.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/radeon/atombios.h 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/r420.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_atombios.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_connectors.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_mode.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.