commit | 0dbe23218333bad3e75148f090fe670d8ca41ad6 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Sun Oct 07 21:04:20 2012 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Sun Oct 07 21:04:20 2012 +1000 |
tree | 30602277cf6dae7f2ee6df792ad29647909ff05f | |
parent | 0b8e74c6f44094189dbe78baf4101acc7570c6af [diff] | |
parent | 718dcedd7e87f448a1eeeda4d1a986284c243110 [diff] |
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