tree c5b5856dc88582697997bb10ccacad6fc2535465
parent ca7fe2db892dcf91b2c72ee352eda4ff867903a7
parent 55ba4e5ed4ac57b60fe56acfd324f6a87123cc34
author Vinod Koul <vinod.koul@linux.intel.com> 1321521878 +0530
committer Vinod Koul <vinod.koul@linux.intel.com> 1321521897 +0530

Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c