From: Dave Airlie Date: Mon, 7 May 2012 15:09:09 +0000 (+0100) Subject: Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into... X-Git-Tag: firefly_0821_release~3680^2~2761^2~39 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next Daniel prepared this branch with a back-merge as git was getting very confused about changes in intel_display.c --- 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd