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)
commit9cb6f55f2f50555f60505392516c121c76c132a9
tree870429efbf898dd596bc45007c5b12d8ac1f9750
parentf265deb969e6078c11476fc9756ebd72e003d084
ARM: dma-mapping: fix some CMA related mismerge

no idea what happened :/
arch/arm/mm/dma-mapping.c