From: Dave Airlie <airlied@redhat.com>
Date: Wed, 23 Feb 2011 02:07:27 +0000 (+1000)
Subject: Merge branch 'drm-mm-cleanup' into drm-next
X-Git-Tag: v2.6.39-rc2~3^2~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63871f89d158e3f3e469dde00dd15763d474cb3c;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'drm-mm-cleanup' into drm-next

* drm-mm-cleanup:
  radeon: move blit functions to radeon_asic.h
  radeon: kill decls for inline functions
  radeon: consolidate asic-specific function decls for r600 & later
  drm/radeon: kill radeon_bo->gobj pointer
  drm/radeon: introduce gem_to_radeon_bo helper
  drm/radeon: embed struct drm_gem_object
  drm: mm: add helper to unwind scan state
  drm: mm: add api for embedding struct drm_mm_node
  drm: mm: extract node insert helper functions
  drm: mm: track free areas implicitly
  drm/nouveau: don't munge in drm_mm internals
---

63871f89d158e3f3e469dde00dd15763d474cb3c