Hi Dave,
As discussed on irc&mail, here's the pull request for the manual merge to
unconfuse git about the changes in intel_display.c. Note that I've
manually frobbed the shortlog to exclude all the changes merge through
Linus' tree.
Yours, Daniel
The following changes since commit 5bc69bf9aeb73547cad8e1ce683a103fe9728282:
Merge tag 'drm-intel-next-2012-04-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next (2012-05-02 09:22:29 +0100)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel for-airlied
for you to fetch changes up to dc257cf154be708ecc47b8b89c12ad8cd2cc35e4:
Merge tag 'v3.4-rc6' into drm-intel-next (2012-05-07 14:02:14 +0200)
----------------------------------------------------------------
Daniel Vetter (1):
Merge tag 'v3.4-rc6' into drm-intel-next
--
Daniel Vetter
Mail: daniel@xxxxxxxx
Mobile: +41 (0)79 365 57 48
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
