[git pull] fifth times a charm

[Dave Airlie]

The same as before with Aaron's fix on top.

Dave.

The following changes since commit 451ba4bd41b82acd4aec6236ba121e00cfeb311b:

  hw/xfree86: Only report SetDesiredModes() failed if at least one
modeset fails (2013-04-29 09:10:06 -0700)

are available in the git repository at:

  ssh://people.freedesktop.org/~airlied/xserver for-keithp

for you to fetch changes up to dbfeaf70623a83e1a3f3255c94d52e0e04702837:

  xfree86: don't enable anything in xf86InitialConfiguration for GPU
screens (2013-05-06 09:34:27 +1000)

----------------------------------------------------------------
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

 dix/dispatch.c                      |  2 --
 dix/main.c                          |  3 +++
 dix/pixmap.c                        |  2 ++
 fb/fbpixmap.c                       |  1 +
 hw/xfree86/common/xf86platformBus.c | 11 ++++++++++-
 hw/xfree86/modes/xf86Crtc.c         | 34 ++++++++++++++++++++++++----------
 hw/xfree86/modes/xf86RandR12.c      |  2 ++
 randr/randr.c                       | 24 +++++++++++++++++++++++-
 randr/randrstr.h                    |  4 ++++
 randr/rrcrtc.c                      |  2 +-
 randr/rrinfo.c                      |  2 +-
 randr/rroutput.c                    |  2 +-
 randr/rrscreen.c                    |  2 +-
 13 files changed, 73 insertions(+), 18 deletions(-)