From: Dave Airlie <airlied@redhat.com>
Date: Wed, 6 Oct 2010 01:47:56 +0000 (+1000)
Subject: Merge branch 'drm-vmware-next' into drm-core-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e6b46ee712b92db1cc2449cf4f65bc635366cad4;hp=-c;p=mv-sheeva.git

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

* drm-vmware-next:
  drm/vmwgfx: Bump minor and driver date
  drm/vmwgfx: Save at least one screen layout
  drm/vmwgfx: Add modinfo version
  drm/vmwgfx: Add a parameter to get the max fb size
  drm/vmwgfx: Don't flush fb if we're in the suspended state.
  drm/vmwgfx: Prune modes based on available VRAM size
  drm/vmwgfx: Take the ttm lock around the dirty ioctl
  drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback
  drm/vmwgfx: Add new-style PM hooks to improve hibernation behavior
  drm/vmwgfx: Fix ACPI S3 & S4 functionality.
  drm/vmwgfx: Really support other depths than 32
---

e6b46ee712b92db1cc2449cf4f65bc635366cad4