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)
commit4dabd1b94da7aedb5c18b67e85c6a71cc1161eac
tree75e06ef26bb69e1676f31e13bd461a0e26e45a07
parent269b62db0e52bf2656aa762d61cfe67f3705fdff
parent9cad9c95d7e8d6d61d8c9729e0b6bbd18f47d86d
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