merge linus head to drm-mm branch

diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index e84a7876a1b3d19664b387a817c02d9edbb0cd19..3f73aa774c80975eee97134a29ac43fb0a7de294 100644 (file)
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -155,7 +155,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
        offset = address - vma->vm_start;
        i = (unsigned long)map->handle + offset;
        page = (map->type == _DRM_CONSISTENT) ?
-           virt_to_page((void *)i) : vmalloc_to_page((void *)i);
+               virt_to_page((void *)i) : vmalloc_to_page((void *)i);
        if (!page)
                return NOPAGE_OOM;
        get_page(page);