| commit | ca2a2bb13efd1cb42c227d3e2ddac35708146cc1 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Jan 13 13:55:48 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Jan 13 13:55:48 2014 +1000 |
| tree | 7cd017a0a4bdf262797ed5c75e947065076ab115 | |
| parent | e95d9f9550358c39d82d32aa53a3867867216103 [diff] | |
| parent | 8dd9ad5d3bf4759399e0c716dd065e7d90eee102 [diff] |
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