diff --git a/[refs] b/[refs]
index 717d77c58de3..05ec80f808ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 384c36893f94e0e2145832cf2f20684ae372aee5
+refs/heads/master: 2f8de1a10697efe7bee08e51b587208706b44e97
diff --git a/trunk/drivers/media/video/cpia.c b/trunk/drivers/media/video/cpia.c
index d93a561e6b80..3cebfa91ca14 100644
--- a/trunk/drivers/media/video/cpia.c
+++ b/trunk/drivers/media/video/cpia.c
@@ -58,7 +58,7 @@ static int video_nr = -1;
 
 #ifdef MODULE
 module_param(video_nr, int, 0);
-MODULE_AUTHOR("Scott J. Bertin <sbertin@securenym.net> & Peter Pregler <Peter_Pregler@email.com> & Johannes Erdfelt <johannes@erdfeld.com>");
+MODULE_AUTHOR("Scott J. Bertin <sbertin@securenym.net> & Peter Pregler <Peter_Pregler@email.com> & Johannes Erdfelt <johannes@erdfelt.com>");
 MODULE_DESCRIPTION("V4L-driver for Vision CPiA based cameras");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("video");