schmidt 1208651185 +1000 committer Dave Airlie 1209196097 +1000 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 Signed-off-by: Dave Airlie %0¯ ˜"x