Merge remote-tracking branch 'regulator/topic/anatop' into regulator-next

f2399df7 · Mark Brown · 420118d4 · 34f75685 · f2399df7
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

drivers/regulator/anatop-regulator.c drivers/regulator/anatop-regulator.c +2 -2

未找到文件。
--- 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");