[git pull] fifth times a charm

[Keith Packard]

Dave Airlie <airlied at gmail.com> writes:

> Aaron Plattner (1):
>       xfree86: don't enable anything in xf86InitialConfiguration for GPU screens
>
> Dave Airlie (8):
>       randr: don't directly set changed bits in randr screen
>       randr: make SetChanged modify the main protocol screen not the gpu screen
>       randr: only respected changed on the protocol screen
>       randr: report changes when we disconnect a GPU slave
>       dix/gpu: remove asserts for output/offload from same slave
>       xf86crtc: don't use scrn->display for gpu screens
>       dix: allow pixmap dirty helper to be used for non-shared pixmaps
>       gpu: call CreateScreenResources for GPU screens

Merged.
   451ba4b..dbfeaf7  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130506/2e163ac1/attachment.pgp>