tree e8c3935665e78572a767eca0ca4a91b4ee8c7e40
parent 8bf42225dac865665a5a0f8bbe1b62139470ffa0
parent 0a240ec43667c6e1005a566dde60863b9c16cc21
author Dave Airlie <airlied@redhat.com> 1329134651 +0000
committer Dave Airlie <airlied@redhat.com> 1329134651 +0000

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