tree 3c457cc25959d1b934175df20fa2dfe05e2a45ee
parent 2e9b11afdbfe17a9cc6356076179b7ea11972607
parent 6cb504c29b1338925c83e4430e42a51eaa43781e
author Linus Torvalds <torvalds@linux-foundation.org> 1249855089 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249855089 -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/i915: silence vblank warnings
  drm: silence pointless vblank warning.
  drm: When adding probed modes, preserve duplicate mode types