From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 03:12:28 +0000 (+1000)
Subject: Merge branch 'drm-ttm-pool' into drm-core-next
X-Git-Tag: v2.6.35-rc1~451^2~90
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b41276da65481d36311a13d69020d150861c43;p=pandora-kernel.git

Merge branch 'drm-ttm-pool' into drm-core-next

* drm-ttm-pool:
  drm/ttm: using kmalloc/kfree requires including slab.h
  drm/ttm: include linux/seq_file.h for seq_printf
  drm/ttm: Add sysfs interface to control pool allocator.
  drm/ttm: Use set_pages_array_wc instead of set_memory_wc.
  arch/x86: Add array variants for setting memory to wc caching.
  drm/nouveau: Add ttm page pool debugfs file.
  drm/radeon/kms: Add ttm page pool debugfs file.
  drm/ttm: Add debugfs output entry to pool allocator.
  drm/ttm: add pool wc/uc page allocator V3
---

c2b41276da65481d36311a13d69020d150861c43
Reading git-diff-tree failed