From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Aug 2009 21:58:09 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
X-Git-Tag: v2.6.31-rc6~30
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fb1ee451e64a1c963a149aeccd9ef6a718f545e7;p=linux.git

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
---

fb1ee451e64a1c963a149aeccd9ef6a718f545e7