Merge tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / net / caif / cfsrvl.c

diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index 95f7f5ea30efda9d53a1cf1eae73ae6119862932..353f793d1b3bb7285d466f0f67f3bc6023e10e49 100644 (file)
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Author:     Sjur Brendeland/sjur.brandeland@stericsson.com
+ * Author:     Sjur Brendeland
  * License terms: GNU General Public License (GPL) version 2
  */