Merge branch 'master' into for-next

[sfrench/cifs-2.6.git] / include / video / newport.h

diff --git a/include/video/newport.h b/include/video/newport.h
index 3d7c4b492ec61944c3af0cef9a56c30d7f23badd..de980a3b60c93a2fe788a9eac8ad6be5bf13b6f3 100644 (file)
--- a/include/video/newport.h
+++ b/include/video/newport.h
@@ -3,7 +3,7 @@
  * newport.h: Defines and register layout for NEWPORT graphics
  *            hardware.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * 
  * Ulf Carlsson - Compatibility with the IRIX structures added
  */