Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply fixes on top of newer things in tree (efi-stub). Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
commit
e23c34bb41
11720 changed files with 574391 additions and 276332 deletions
|
@ -383,6 +383,8 @@ out:
|
|||
g2d_userptr->npages,
|
||||
g2d_userptr->vma);
|
||||
|
||||
exynos_gem_put_vma(g2d_userptr->vma);
|
||||
|
||||
if (!g2d_userptr->out_of_list)
|
||||
list_del_init(&g2d_userptr->list);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue