From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 20 Apr 2008 00:26:25 +0000 (+1000)
Subject: drm: Fix mismerge of non-coherent DMA patch
X-Git-Tag: v2.6.26-rc1~1048^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ff64611333fd282793ff8997e02138aa2f6aab9;p=pandora-kernel.git

drm: Fix mismerge of non-coherent DMA patch

The patch for supporting non coherent PCI DMA in the DRM was mismerged
causing the page protection to be updated for the wrong type of
mapping.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

Reading git-diff-tree failed