summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:32 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:32 +0100
commitf2399df731bb1e2d6eed6a18b8e4a8addaccab0e (patch)
tree12a656a14a0bac4daa9375fcb06c0711b7e8c56f /drivers/regulator
parent420118d48311e0c4ef4aace5aede35079ecc2412 (diff)
parent34f7568510564726d33fe8248736ece7d76d0054 (diff)
downloadlinux-f2399df731bb1e2d6eed6a18b8e4a8addaccab0e.tar.bz2
Merge remote-tracking branch 'regulator/topic/anatop' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/anatop-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index e42bfd17562a..c734d0980826 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -255,7 +255,7 @@ static void __exit anatop_regulator_exit(void)
}
module_exit(anatop_regulator_exit);
-MODULE_AUTHOR("Nancy Chen <Nancy.Chen@freescale.com>, "
- "Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>");
+MODULE_AUTHOR("Nancy Chen <Nancy.Chen@freescale.com>");
+MODULE_AUTHOR("Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>");
MODULE_DESCRIPTION("ANATOP Regulator driver");
MODULE_LICENSE("GPL v2");