tree 6f25a84cd251a605b103111d1bd615bfb13b9ae2
parent cce2c56e7666199916525907dc817209dd58287c
parent 8aeb96f80232e9a701b5c4715504f4c9173978bd
author Linus Torvalds <torvalds@linux-foundation.org> 1304473929 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1304473929 -0700

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

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix gart setup on fusion parts (v2)
  drm: Send pending vblank events before disabling vblank.
  drm/radeon: fix regression on atom cards with hardcoded EDID record.
  drm/radeon/kms: add some new pci ids