---

yaml --- r: 305133 b: refs/heads/master c: 3d4f5eb h: refs/heads/master i: 305131: 5119217 v: v3
git-mirror · May 17, 2012 · f8b81b7 · f8b81b7
1 parent 15ca594
commit f8b81b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7799b05d8d13819ebde62da9e06255d1f6f2cf3
+refs/heads/master: 3d4f5eb1264a1d3aa4aa19502d8c588b3cc4ecc4
diff --git a/trunk/drivers/net/ethernet/s6gmac.c b/trunk/drivers/net/ethernet/s6gmac.c
@@ -1,7 +1,7 @@
 /*
  * Ethernet driver for S6105 on chip network device
  * (c)2008 emlix GmbH http://www.emlix.com
- * Authors:	Oskar Schirmer <os@emlix.com>
+ * Authors:	Oskar Schirmer <oskar@scara.com>
  *		Daniel Gloeckner <dg@emlix.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -1070,4 +1070,4 @@ module_exit(s6gmac_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("S6105 on chip Ethernet driver");
-MODULE_AUTHOR("Oskar Schirmer <os@emlix.com>");
+MODULE_AUTHOR("Oskar Schirmer <oskar@scara.com>");