]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
* drm-plane-jbarnes:
  drm: add an fb creation ioctl that takes a pixel format v5
  drm: add plane support v3


Trivial merge