Merge branch 'postmerge' into for-linus

[linux.git] / net / caif / cfveil.c

diff --git a/net/caif/cfveil.c b/net/caif/cfveil.c
index 910ab0661f66dc9ac24da2b3ab4ae41ad4ff2ea3..262224581efafd87ed89af723f1fa91046f1aa15 100644 (file)
--- a/net/caif/cfveil.c
+++ b/net/caif/cfveil.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Author:     Sjur Brendeland/[email protected]
+ * Author:     Sjur Brendeland
  * License terms: GNU General Public License (GPL) version 2
  */