tree 5a67f674b77cfdc47bd386f114fbf5a6bff740c6
parent 97921a5b03d40681b3aed620a5e719710336c6df
parent 2125b8a44d771351fc44719ed291be70b73672ad
author Dave Airlie <airlied@redhat.com> 1271733148 +1000
committer Dave Airlie <airlied@redhat.com> 1271733148 +1000

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