Merge branch 'master' into for-next

[linux.git] / drivers / gpu / drm / exynos / exynos_drm_gem.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 1ade191d84f4d6514fd16871cb54cbdc3208d925..be59d50d8b16c836fbd1a5c88ed2bea87a7b769f 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -652,7 +652,7 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
        int ret;
 
        /*
-        * alocate memory to be used for framebuffer.
+        * allocate memory to be used for framebuffer.
         * - this callback would be called by user application
         *      with DRM_IOCTL_MODE_CREATE_DUMB command.
         */