diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 10:36:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 10:36:39 -0700 |
| commit | 4a35cee066df1b1958e25e71595b3845d06b192e (patch) | |
| tree | 0d6c9de77da09a6d42d1bf03983f620615cc6f24 /drivers/media/video/ivtv/ivtvfb.c | |
| parent | 7e6880951da86928c7f6cecf26dcb8e8d9f826da (diff) | |
| parent | d7ef1533a90f432615d25729c2477bac9e72051d (diff) | |
Merge branch 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6
* 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
swiotlb: Make swiotlb bookkeeping functions visible in the header file.
swiotlb: search and replace "int dir" with "enum dma_data_direction dir"
swiotlb: Make internal bookkeeping functions have 'swiotlb_tbl' prefix.
swiotlb: add the swiotlb initialization function with iotlb memory
swiotlb: add swiotlb_tbl_map_single library function
Diffstat (limited to 'drivers/media/video/ivtv/ivtvfb.c')
0 files changed, 0 insertions, 0 deletions