From: Dave Airlie Date: Tue, 17 May 2016 06:34:43 +0000 (+1000) Subject: Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7c10ddf87472c07eabc206e273dc59f77c700858;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next Not the biggest fan of doing it this way, but what the hell. * 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux: (22 commits) drm/vmwgfx: add extern C guard for the UAPI header drm/virgl: add extern C guard for the UAPI header drm/via: add extern C guard for the UAPI header drm/vc4: add extern C guard for the UAPI header drm/tegra: add extern C guard for the UAPI header drm/sis: add extern C guard for the UAPI header drm/savage: add extern C guard for the UAPI header drm/radeon: add extern C guard for the UAPI header drm/r128: add extern C guard for the UAPI header drm/qxl: add extern C guard for the UAPI header drm/omap: add extern C guard for the UAPI header drm/nouveau: drop drm/ prefix from include drm/nouveau: add extern C guard for the UAPI header drm/msm: add extern C guard for the UAPI header drm/mga: add extern C guard for the UAPI header drm/i915: add extern C guard for the UAPI header drm/i810: add extern C guard for the UAPI header drm/exynos: add extern C guard for the UAPI header drm/etnaviv: add extern C guard for the UAPI header drm: add extern C guard for the UAPI headers ... --- 7c10ddf87472c07eabc206e273dc59f77c700858