Merge branch 'drm-plane-jbarnes' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 15 Nov 2011 19:57:59 +0000 (19:57 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 15 Nov 2011 19:57:59 +0000 (19:57 +0000)
commit08aa3fe97a4a36b1cac53335f528435ee3ae02ed
tree5e4eebef07685c4047f54d1727fc9bcbace8889d
parente08e96de986ceb2c6b683df0bd0c4ddd4f91dcfd
parent308e5bcbdb10452e8aba31aa21432fb67ee46d72
Merge branch 'drm-plane-jbarnes' into drm-core-next

* drm-plane-jbarnes:
  drm: add an fb creation ioctl that takes a pixel format v5
  drm: add plane support v3