diff options
author | Dave Airlie <airlied@redhat.com> | 2015-12-19 11:45:31 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-12-19 11:45:31 +1000 |
commit | 45ad5ccfa9c72da35905dab4603df0d0f383af8f (patch) | |
tree | dd226fc3d0d4e619bccd90e52ac6418730d8a684 /include/uapi/drm | |
parent | 544a14fd222b5dedfa32e9e69c0da9345b996e15 (diff) | |
parent | e112e593b215c394c0303dbf0534db0928e87967 (diff) | |
download | linux-next-45ad5ccfa9c72da35905dab4603df0d0f383af8f.tar.gz |
Merge tag 'topic/drm-misc-2015-12-18' of git://anongit.freedesktop.org/drm-intel into drm-next
Seems I lied in my last drm-misc pull request and suddenly there's a big
pile of random stuff. Boris dug out Thierry's drm-trivial branch and
resubmitted everything since that branch didn't really work out.
On top of that Nicolas' changes to drm_dev_set_unique - this might
conflict with new driver pulls (I double checked and current drm-next
should be fine), so please beware. The -next/-fixes conflict in vmwgfx
will change slightly with this here too.
* tag 'topic/drm-misc-2015-12-18' of git://anongit.freedesktop.org/drm-intel: (36 commits)
drm: use dev_name as default unique name in drm_dev_alloc()
drm: make drm_dev_set_unique() not use a format string
drm/vmwgfx: Constify function pointer structs
drm/udl: Constify function pointer structs
drm/tegra: Constify function pointer structs
drm/rockchip: Constify function pointer structs
drm/nouveau: Constify function pointer structs
drm/mgag200: Constify function pointer structs
drm/imx: Constify function pointer structs
drm/i2c/sil164: Constify function pointer structs
drm/i2c/adv7511: Constify function pointer structs
drm/exynos: Constify function pointer structs
drm/cirrus: Constify function pointer structs
drm/i2c/ch7006: Constify function pointer structs
drm/bridge/nxp-ptn3460: Constify function pointer structs
drm/bridge/dw_hdmi: Constify function pointer structs
drm/bochs: Constify function pointer structs
drm/atmel-hlcdc: Constify function pointer structs
drm/armada: Constify function pointer structs
drm: Constify drm_encoder_slave_funcs
...
Diffstat (limited to 'include/uapi/drm')
0 files changed, 0 insertions, 0 deletions