]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b1721d0) | patch
drm: Fix mismerge of non-coherent DMA patch
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 20 Apr 2008 00:26:25 +0000 (10:26 +1000)
committerDave Airlie <airlied@linux.ie>
Sat, 26 Apr 2008 07:48:17 +0000 (17:48 +1000)
commit5ff64611333fd282793ff8997e02138aa2f6aab9
tree2e12a44f3e55c28091dda4919d41a9d64078c077tree | snapshot
parentb1721d0da266b4af8cb4419473b4ca36206ab200commit | diff
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>
drivers/char/drm/drm_vm.c diff | blob | history
Linux 2.6 source tree