summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-23 12:06:39 +1000
committerDave Airlie <airlied@redhat.com>2011-02-23 12:06:39 +1000
commitde1e7cd63a8ec26a3bd3740708cfd72dd76509e2 (patch)
tree52bc82a71f34e92895d22821543a2be011834505 /drivers/hwmon
parent7811bddb6654337fd85837ef14c1a96a0c264745 (diff)
parent5a893fc28f0393adb7c885a871b8c59e623fd528 (diff)
downloadblackbird-op-linux-de1e7cd63a8ec26a3bd3740708cfd72dd76509e2.tar.gz
blackbird-op-linux-de1e7cd63a8ec26a3bd3740708cfd72dd76509e2.zip
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.
Diffstat (limited to 'drivers/hwmon')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud