Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / caif / chnl_net.c

diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index 26a4e4e3a767c6e19c0298530f24a4fd6e2d2211..7344a8fa1bb011a8b009a7f363d2f98581ed8668 100644 (file)
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Authors:    Sjur Brendeland/sjur.brandeland@stericsson.com
- *             Daniel Martensson / Daniel.Martensson@stericsson.com
+ * Authors:    Sjur Brendeland
+ *             Daniel Martensson
  * License terms: GNU General Public License (GPL) version 2
  */