projects / sdk / emulator / emulator-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e95d9f9 8dd9ad5)
Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daein...
authorDave Airlie <airlied@redhat.com>
Mon, 13 Jan 2014 03:55:48 +0000 (13:55 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 13 Jan 2014 03:55:48 +0000 (13:55 +1000)
commitca2a2bb13efd1cb42c227d3e2ddac35708146cc1
tree7cd017a0a4bdf262797ed5c75e947065076ab115tree | snapshot
parente95d9f9550358c39d82d32aa53a3867867216103commit | diff
parent8dd9ad5d3bf4759399e0c716dd065e7d90eee102commit | diff
Merge branch 'exynos-drm-next' of git://git./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
Domain: SDK / Emulator;