]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-minor' into drm-next
authorDavid Herrmann <dh.herrmann@gmail.com>
Sun, 16 Mar 2014 12:13:51 +0000 (13:13 +0100)
committerDavid Herrmann <dh.herrmann@gmail.com>
Sun, 16 Mar 2014 12:13:51 +0000 (13:13 +0100)
commit12454c928dd3ff99360058ef11b44c5c814c5936
treebb1d32d025f97fc47f44a037951563c72eaf586d
parentb4785d33a4a8a884cc226de715e68d4f232fc631
parentb60ff2c78b2251da7586470d939e10f79f472c89
Merge branch 'drm-minor' into drm-next

Fix minor conflicts with drm-anon:
 - allocation/free order
 - drm_device header cleanups
drivers/gpu/drm/drm_fops.c
drivers/gpu/drm/drm_stub.c
include/drm/drmP.h