From: Dave Airlie Date: Tue, 8 Dec 2009 03:52:41 +0000 (+1000) Subject: Merge branch 'drm-core-next' into drm-linus X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1bd049fa895f9c6743f38b52ce14775f5a31ea63;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'drm-core-next' into drm-linus Bring all core drm changes into 2.6.32 tree and resolve the conflict that occurs. Conflicts: drivers/gpu/drm/drm_fb_helper.c --- 1bd049fa895f9c6743f38b52ce14775f5a31ea63