Merge branch 'modesetting-101' into modesetting-gem

diff --cc linux-core/intel_fb.c
index d53b22f,64a8fc9..b082080
--- 1/linux-core/intel_fb.c
--- 2/linux-core/intel_fb.c
+++ b/linux-core/intel_fb.c
@@@ -1014,12 -1029,13 +1042,15 @@@ int intelfb_remove(struct drm_device *d
        
        if (info) {
                unregister_framebuffer(info);
 -              drm_bo_kunmap(&intel_fb->kmap);
 -              drm_bo_usage_deref_unlocked(&intel_fb->bo);
 +              iounmap(info->screen_base);
 +              mutex_lock(&dev->struct_mutex);
 +              drm_gem_object_unreference(intel_fb->obj);
 +              mutex_unlock(&dev->struct_mutex);
                framebuffer_release(info);
        }
+ 
+       atomic_notifier_chain_unregister(&panic_notifier_list, &paniced);
+       memset(&panic_mode, 0, sizeof(struct drm_mode_set));
        return 0;
  }
  EXPORT_SYMBOL(intelfb_remove);