| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@linux.intel.com> | Thu Nov 17 14:54:38 2011 +0530 |
| committer | Vinod Koul <vinod.koul@linux.intel.com> | Thu Nov 17 14:54:57 2011 +0530 |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 | |
| parent | ca7fe2db892dcf91b2c72ee352eda4ff867903a7 [diff] | |
| parent | 55ba4e5ed4ac57b60fe56acfd324f6a87123cc34 [diff] |
Merge branch 'dma_slave_direction' into next_test_dirn resolved conflicts: drivers/media/video/mx3_camera.c