Merge branch 'drm-core-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Thu, 7 Jan 2010 03:36:00 +0000 (13:36 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 7 Jan 2010 03:36:00 +0000 (13:36 +1000)
* 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()


Trivial merge