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)
commit07b48c3ac539828d744f0562da1f24e8a234d06e
treebb1d32d025f97fc47f44a037951563c72eaf586d
parentafab4463acc5ae7aa975a0c2400b85ff541c6a5b
parent0d639883ee26359e1bf38195df1dbca0f879e239
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