Skip to content
Snippets Groups Projects
Commit e0d23ef2 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c
parents ca7fe2db 55ba4e5e
No related branches found
No related tags found
No related merge requests found
Showing
with 110 additions and 111 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment