projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b8e74c 718dced)
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)
Merge the uapi bits for drm.

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


Trivial merge