Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm into drm-core...
authorDave Airlie <airlied@redhat.com>
Thu, 22 Dec 2011 19:05:01 +0000 (19:05 +0000)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Dec 2011 19:05:01 +0000 (19:05 +0000)
* 'for-airlied' of git://people.freedesktop.org/~danvet/drm:
  drm/i810: don't acces hw regs in lastclose
  drm/i810: cleanup reclaim_buffers
  drm: kill drm_sman
  drm/sis: use drm_mm instead of drm_sman
  drm/via: use drm_mm instead of drm_sman
  drm/sman: kill user_hash_tab
  drm/sis: track user->memblock mapping with idr
  drm/via: track user->memblock mapping with idr
  drm/sman: rip out owner tracking
  drm/sman: kill owner tracking interface functions
  drm/via: track obj->drm_fd relations in the driver
  drm/sis: track obj->drm_fd relations in the driver


Trivial merge