From: Dave Airlie Date: Thu, 7 Jan 2010 03:36:00 +0000 (+1000) Subject: Merge branch 'drm-core-next' into drm-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90520b78a4f8ba1faef75961eddd8192077e0ac2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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