From: Dave Airlie <airlied@redhat.com>
Date: Thu, 7 Jan 2010 03:36:00 +0000 (+1000)
Subject: Merge branch 'drm-core-next' into drm-linus
X-Git-Tag: v2.6.33-rc4~17^2~6
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=90520b78a4f8ba1faef75961eddd8192077e0ac2

Merge branch 'drm-core-next' into drm-linus

* drm-core-next:
  drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
  drm/edid: Fix CVT width/height decode
  drm/edid: Skip empty CVT codepoints
  drm: remove address mask param for drm_pci_alloc()
---

90520b78a4f8ba1faef75961eddd8192077e0ac2