git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca7fe2d 55ba4e5)
Merge branch 'dma_slave_direction' into next_test_dirn
authorVinod Koul <vinod.koul@linux.intel.com>
Thu, 17 Nov 2011 09:24:38 +0000 (14:54 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Thu, 17 Nov 2011 09:24:57 +0000 (14:54 +0530)
resolved conflicts:
drivers/media/video/mx3_camera.c


Trivial merge
Pandora Kernel Repository