summaryrefslogtreecommitdiff
path: root/arch/mips/vr41xx/casio-e55
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-07 02:55:05 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2009-07-07 02:55:05 (GMT)
commit2b5c0c72ea404d6b554a8284031dd78748314b9e (patch)
tree468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /arch/mips/vr41xx/casio-e55
parent2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (diff)
parentdc53fffc105f68cb08ca872acd51550e89aa2e67 (diff)
downloadlinux-2b5c0c72ea404d6b554a8284031dd78748314b9e.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'arch/mips/vr41xx/casio-e55')
-rw-r--r--arch/mips/vr41xx/casio-e55/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/casio-e55/setup.c b/arch/mips/vr41xx/casio-e55/setup.c
index 6d9bab8..719f4a5 100644
--- a/arch/mips/vr41xx/casio-e55/setup.c
+++ b/arch/mips/vr41xx/casio-e55/setup.c
@@ -1,7 +1,7 @@
/*
* setup.c, Setup for the CASIO CASSIOPEIA E-11/15/55/65.
*
- * Copyright (C) 2002-2006 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ * Copyright (C) 2002-2006 Yoichi Yuasa <yuasa@linux-mips.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by