From: Dave Airlie <airlied@redhat.com>
Date: Sun, 7 Oct 2012 11:04:20 +0000 (+1000)
Subject: Merge branch 'disintegrate-drm' of git://git.infradead.org/users/dhowells/linux-heade... 
X-Git-Tag: MMI-PSA29.97-13-9~15788^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0dbe23218333bad3e75148f090fe670d8ca41ad6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

0dbe23218333bad3e75148f090fe670d8ca41ad6