]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8a47c1 648ac05)
Merge branch 'drm-radeon-linus' of ../drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 11 Feb 2010 04:03:51 +0000 (14:03 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 11 Feb 2010 04:03:51 +0000 (14:03 +1000)
* 'drm-radeon-linus' of ../drm-next:
  drm/radeon/kms: retry auxch on 0x20 timeout value.
  drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine.
  drm/radeon/kms: fix screen clearing before fbcon.
  drm/radeon/kms: add quirk for VGA without DDC on rv730 XFX card.
  drm/radeon/kms: don't crash if no DDC bus on VGA/DVI connector.
  drm/radeon/kms: change Kconfig text to reflect the new option.
  drm/radeon/kms: suspend and resume audio stuff

1  2 
drivers/gpu/drm/radeon/r600.c patch | diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_fb.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge
diff --cc drivers/gpu/drm/radeon/radeon_fb.c
Simple merge
XArray, radix tree and IDR