diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-17 04:00:44 -0700 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-17 14:07:11 +0200 |
commit | a1bcf113af7ca46f2a071781fefe91e146101fd8 (patch) | |
tree | 4487b3a693e144df95345f6a251f83c90e9e39e1 /patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch | |
parent | 92c55efc46f830a3f25ae93c0d568677c3c7b0c9 (diff) |
backports: refresh patches for next-20130430
1 2.6.24 [ OK ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.76 [ OK ]
18 3.1.10 [ OK ]
19 3.2.44 [ OK ]
20 3.3.8 [ OK ]
21 3.4.43 [ OK ]
22 3.5.7 [ OK ]
23 3.6.11 [ OK ]
24 3.7.10 [ OK ]
25 3.8.11 [ OK ]
26 3.9.0 [ OK ]
real 30m45.327s
user 814m25.678s
sys 128m22.341s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch')
-rw-r--r-- | patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch b/patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch index 2a6f51aa..c1f3dc5e 100644 --- a/patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch +++ b/patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch @@ -25,7 +25,7 @@ Date: Thu Jun 14 11:32:21 2012 -0300 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c -@@ -186,6 +186,52 @@ static void *vb2_dc_alloc(void *alloc_ct +@@ -183,6 +183,52 @@ static void *vb2_dc_alloc(void *alloc_ct return buf; } @@ -78,7 +78,7 @@ Date: Thu Jun 14 11:32:21 2012 -0300 static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dc_buf *buf = buf_priv; -@@ -222,6 +238,7 @@ static int vb2_dc_mmap(void *buf_priv, s +@@ -219,6 +265,7 @@ static int vb2_dc_mmap(void *buf_priv, s return 0; } |