.intel.com> 1321521897 +0530

Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c
tÜ{üœ&x