From: Dave Airlie Date: Mon, 13 Jan 2014 03:55:48 +0000 (+1000) Subject: Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daein... X-Git-Tag: v3.14-rc1~47^2~40 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ca2a2bb13efd1cb42c227d3e2ddac35708146cc1;p=linux.git Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next This pull request adds an anon file for exynos specific mmaper to resolve potential a dead lock issue pointed out by Al Viro, and fixes build break of drm-next. * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: drm/exynos: fix build error caused by removed drm core macros drm/exynos: use a new anon file for exynos gem mmaper --- ca2a2bb13efd1cb42c227d3e2ddac35708146cc1