From: David Herrmann <dh.herrmann@gmail.com>
Date: Sun, 16 Mar 2014 12:13:51 +0000 (+0100)
Subject: Merge branch 'drm-minor' into drm-next
X-Git-Tag: v3.15-rc1~51^2~52^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07b48c3ac539828d744f0562da1f24e8a234d06e;p=pandora-kernel.git

Merge branch 'drm-minor' into drm-next

Fix minor conflicts with drm-anon:
 - allocation/free order
 - drm_device header cleanups
---

07b48c3ac539828d744f0562da1f24e8a234d06e
Reading git-diff-tree failed