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)
Fix minor conflicts with drm-anon:
 - allocation/free order
 - drm_device header cleanups


Trivial merge