Merge branch 'disintegrate-drm' of git://git.infradead.org/users/dhowells/linux-heade...
authorDave Airlie <airlied@redhat.com>
Sun, 7 Oct 2012 11:04:20 +0000 (21:04 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 7 Oct 2012 11:04:20 +0000 (21:04 +1000)
commit0dbe23218333bad3e75148f090fe670d8ca41ad6
tree30602277cf6dae7f2ee6df792ad29647909ff05f
parent0b8e74c6f44094189dbe78baf4101acc7570c6af
parent718dcedd7e87f448a1eeeda4d1a986284c243110
Merge branch 'disintegrate-drm' of git://git.infradead.org/users/dhowells/linux-headers into drm-next

Merge the uapi bits for drm.

* 'disintegrate-drm' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/drm