summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/armada/armada_drv.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2020-05-26 12:47:07 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-05-26 12:47:07 +0100
commit03c7f5f0b844e9f652e87daf5c51bb93ccf75296 (patch)
tree140ab988587f2909b890b30c689669aa2a4ad82d /drivers/gpu/drm/armada/armada_drv.c
parent3866f217aaa81bf7165c7f27362eee5d7919c496 (diff)
parentfb597f2a393294f3d3012ecb314f43b60fa48359 (diff)
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
-rw-r--r--drivers/gpu/drm/armada/armada_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 197dca3fc84c..5232f81c16a5 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -311,7 +311,7 @@ static void __exit armada_drm_exit(void)
}
module_exit(armada_drm_exit);
-MODULE_AUTHOR("Russell King <rmk+kernel@arm.linux.org.uk>");
+MODULE_AUTHOR("Russell King <rmk+kernel@armlinux.org.uk>");
MODULE_DESCRIPTION("Armada DRM Driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:armada-drm");