Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / linux / trdevice.h

diff --git a/include/linux/trdevice.h b/include/linux/trdevice.h
index aaa1f337edcbc1d34fbbac2f25aa9cf7e9dd9717..99e02ef54c47db8fa1e9ceff2644acb9c2b98b38 100644 (file)
--- a/include/linux/trdevice.h
+++ b/include/linux/trdevice.h
@@ -7,7 +7,7 @@
  *
  * Version:    @(#)eth.h       1.0.4   05/13/93
  *
- * Authors:    Ross Biro, <bir7@leland.Stanford.Edu>
+ * Authors:    Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *
  *             Relocated to include/linux where it belongs by Alan Cox