]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge branch 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 09:23:22 +0000 (19:23 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 09:23:22 +0000 (19:23 +1000)
commit5a08c07526e9586318c5b57fd90af4350f83e26e
tree14a93206e71a98ec2f26a05c0edc0ce40cae0e5a
parent7550e3668ce1414f6c7edbe8b13c1169a1aa5960
parentc94adc4a65c67a79f0d19285bf5c32fe4c00176f
Merge branch 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel into drm-next

Merge straggling core drm patches.

* 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel:
  drm: Fix use-after-free in the shadow-attache exit code
  drm/fb-helper: Do the 'max_conn_count' zero check
  drm: Check if the allocation has succeeded before dereferencing newmode
  drm/fb-helper: Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par()
  drm/edid: request HDMI underscan by default
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_pci.c