From: Dave Airlie <airlied@redhat.com>
Date: Thu, 23 Aug 2012 23:24:49 +0000 (+1000)
Subject: Merge branch 'drm-doc' of git://linuxtv.org/pinchartl/fbdev into drm-next
X-Git-Tag: firefly_0821_release~3680^2~1922^2~60
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4dabd1b94da7aedb5c18b67e85c6a71cc1161eac;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-doc' of git://linuxtv.org/pinchartl/fbdev into drm-next

* 'drm-doc' of git://linuxtv.org/pinchartl/fbdev:
  Documentation: DocBook DRM framework documentation
---

4dabd1b94da7aedb5c18b67e85c6a71cc1161eac