[PULL] drm-intel-next manual merge

2012-05-07 Thread Daniel Vetter
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 5bc69bf9aeb73

[PULL] drm-intel-next manual merge

2012-05-07 Thread Daniel Vetter
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 5bc69bf9aeb73