diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 16:42:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 16:42:39 -0700 |
| commit | 06a660ada2064bbdcd09aeb8173f2ad128c71978 (patch) | |
| tree | 1d0172ca83bd0a8c2186fcb41ae750420d7acb14 /net/key | |
| parent | d9b44fe30fb8637b23f804eab2e7afbce129d714 (diff) | |
| parent | 63540f01917c0d8b03b9813a0d6539469b163139 (diff) | |
Merge tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
"A series of patches that move part of the code used to allocate memory
from the media subsystem to the mm subsystem"
[ The mm parts have been acked by VM people, and the series was
apparently in -mm for a while - Linus ]
* tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames()
[media] media: vb2: Remove unused functions
[media] media: vb2: Convert vb2_dc_get_userptr() to use frame vector
[media] media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector
[media] media: vb2: Convert vb2_dma_sg_get_userptr() to use frame vector
[media] vb2: Provide helpers for mapping virtual addresses
[media] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()
[media] mm: Provide new get_vaddr_frames() helper
[media] vb2: Push mmap_sem down to memops
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions