tree 9834aa4ba93dbdb398d007eaba639f27148d4bdf
parent ab320af2244462703455dac59fe5ceede24d3662
parent 6b15835282f9c6a023e2625455bfdb822bb9cc64
author Linus Torvalds <torvalds@linux-foundation.org> 1266509421 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266509421 -0800

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix bo's fence association
  drm/radeon/kms: fix indirect buffer management V2
  drm/edid: Fix interlaced detailed timings to be frame size, not field.
  drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
  drm/radeon/kms: use udelay for short delays
  drm/nouveau: Force TV encoder DPMS reinit after resume.
  drm/nouveau: use mutex for vbios lock