Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: delay vblank cleanup until after driver unload

+2 -2
+2 -2
drivers/gpu/drm/drm_stub.c
··· 516 516 } 517 517 driver = dev->driver; 518 518 519 - drm_vblank_cleanup(dev); 520 - 521 519 drm_lastclose(dev); 522 520 523 521 if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && ··· 534 536 kfree(dev->agp); 535 537 dev->agp = NULL; 536 538 } 539 + 540 + drm_vblank_cleanup(dev); 537 541 538 542 list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) 539 543 drm_rmmap(dev, r_list->map);