Merge branch 'drm-doc' of git://linuxtv.org/pinchartl/fbdev into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 23 Aug 2012 23:24:49 +0000 (09:24 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 23 Aug 2012 23:24:49 +0000 (09:24 +1000)
* 'drm-doc' of git://linuxtv.org/pinchartl/fbdev:
  Documentation: DocBook DRM framework documentation


Trivial merge