diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-07 04:55:05 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-07 04:55:05 +0200 |
| commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
| tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /drivers/serial | |
| parent | video: hitfb: Move over to dev_pm_ops. (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-2b5c0c72ea404d6b554a8284031dd78748314b9e.tar.xz linux-2b5c0c72ea404d6b554a8284031dd78748314b9e.zip | |
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 'drivers/serial')
| -rw-r--r-- | drivers/serial/vr41xx_siu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c index 0573f3b5175e..dac550e57c29 100644 --- a/drivers/serial/vr41xx_siu.c +++ b/drivers/serial/vr41xx_siu.c @@ -1,7 +1,7 @@ /* * Driver for NEC VR4100 series Serial Interface Unit. * - * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> + * Copyright (C) 2004-2008 Yoichi Yuasa <yuasa@linux-mips.org> * * Based on drivers/serial/8250.c, by Russell King. * |