From: Dave Airlie <airlied@redhat.com>
Date: Mon, 13 Feb 2012 12:04:11 +0000 (+0000)
Subject: Merge branch 'drm-vmware-next' into drm-core-next
X-Git-Tag: MMI-PSA29.97-13-9~17223^2~94
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ade510153ecb7d50aaf9338fb2def2d5a80f1e1e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'drm-vmware-next' into drm-core-next

* drm-vmware-next:
  drm/vmwgfx: Bump driver minor
  vmwgfx: Move function declaration to correct header
  drm/vmwgfx: Treat out-of-range initial width and height as host errors
  vmwgfx: Pick up the initial size from the width and height regs
  vmwgfx: Add page flip support
  vmwgfx: Pipe fence out of screen object dirty functions
  vmwgfx: Make it possible to get fence from execbuf
  vmwgfx: Clean up pending event references to struct drm_file objects on close
  vmwgfx: Rework fence event action
---

ade510153ecb7d50aaf9338fb2def2d5a80f1e1e