diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-07 08:07:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-07 08:07:35 +0200 |
| commit | d763d5edf945eec47bd443b699f174976f0afc13 (patch) | |
| tree | 3e5cd46b9a783999716bf92176854f4f1215d930 /drivers/char/viocons.c | |
| parent | 790e2a290b499b0400254e6870ec27969065d122 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
| download | kernel_samsung_espresso10-d763d5edf945eec47bd443b699f174976f0afc13.zip kernel_samsung_espresso10-d763d5edf945eec47bd443b699f174976f0afc13.tar.gz kernel_samsung_espresso10-d763d5edf945eec47bd443b699f174976f0afc13.tar.bz2 | |
Merge branch 'linus' into tracing/mmiotrace
Diffstat (limited to 'drivers/char/viocons.c')
| -rw-r--r-- | drivers/char/viocons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 3d3e1c2..65fb848 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c @@ -7,7 +7,7 @@ * Authors: Dave Boutcher <boutcher@us.ibm.com> * Ryan Arnold <ryanarn@us.ibm.com> * Colin Devilbiss <devilbis@us.ibm.com> - * Stephen Rothwell <sfr@au1.ibm.com> + * Stephen Rothwell * * (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation * |