From 9cb6f55f2f50555f60505392516c121c76c132a9 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 2 Mar 2013 21:22:22 +0200
Subject: [PATCH] ARM: dma-mapping: fix some CMA related mismerge

no idea what happened :/
---
Reading git-format-patch failed