tree 52bc82a71f34e92895d22821543a2be011834505
parent 7811bddb6654337fd85837ef14c1a96a0c264745
parent 5a893fc28f0393adb7c885a871b8c59e623fd528
author Dave Airlie <airlied@redhat.com> 1298426799 +1000
committer Dave Airlie <airlied@redhat.com> 1298426799 +1000

Merge branch 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into drm-next

* 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  ttm: Include the 'struct dev' when using the DMA API.
  nouveau/ttm/PCIe: Use dma_addr if TTM has set it.
  radeon/ttm/PCIe: Use dma_addr if TTM has set it.
  ttm: Expand (*populate) to support an array of DMA addresses.
  ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set.
  ttm: Introduce a placeholder for DMA (bus) addresses.