summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-24 08:32:20 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 08:32:20 +0200
commit9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch)
tree6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /include/video
parentefifb: fix int to pointer cast warning (diff)
parentMerge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff)
downloadlinux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.tar.xz
linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/video')
-rw-r--r--include/video/newport.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/newport.h b/include/video/newport.h
index 3d7c4b492ec6..de980a3b60c9 100644
--- 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
*/