git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fce628 8010dad)
Merge branch 'topic/of' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 7 Jan 2014 16:06:24 +0000 (21:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 7 Jan 2014 16:06:24 +0000 (21:36 +0530)
Conflicts:
drivers/dma/mmp_pdma.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Trivial merge
Pandora Kernel Repository