git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f265deb)
ARM: dma-mapping: fix some CMA related mismerge
authorGrazvydas Ignotas <notasas@gmail.com>
Sat, 2 Mar 2013 19:22:22 +0000 (21:22 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Sat, 2 Mar 2013 20:11:15 +0000 (22:11 +0200)
no idea what happened :/

arch/arm/mm/dma-mapping.c patch | blob | history

diff --cc arch/arm/mm/dma-mapping.c
Simple merge
Pandora Kernel Repository