Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Dec 2011 19:31:44 +0000 (11:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Dec 2011 19:31:44 +0000 (11:31 -0800)
commit929e8d4a888cd15df486e5964c8e2021581a8a0f
treec4f7e955063590afc51d98e550517de793448eaf
parent62d7a2927f99be77cfb0ad2ef778bf12ced01193
parent6abff3c78051e40130a1c653f874fb12b9d40254
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  vmwgfx: Clip cliprects against screen boundaries in present and dirty
  vmwgfx: Resend the cursor after legacy modeset
  vmwgfx: Do better culling of presents
  vmwgfx: Refactor kms code to use vmw_user_lookup_handle helper
  vmwgfx: Add helper function to get surface or dmabuf
  vmwgfx: Refactor cursor update
  vmwgfx: Remove dmabuf check in present ioctl
  vmwgfx: Use the revised fifo hw version register when present