Skip to content
Commit 07b48c3a authored by David Rheinsberg's avatar David Rheinsberg
Browse files

Merge branch 'drm-minor' into drm-next 

Fix minor conflicts with drm-anon:
 - allocation/free order
 - drm_device header cleanups
parents afab4463 0d639883
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment