diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
commit | 973a971d5a5ef0d6a60e5c9b0df675fef6be3383 (patch) | |
tree | d49729a4bff6fd5bdacfcc57e7ba44911fd8812c /drivers/ide/alim15x3.c | |
parent | f4bafd5dc0d4f03f6dc4466d233a4601c54d40b3 (diff) | |
parent | a75952b72a0fff3031124003e62118111aed42c1 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'drivers/ide/alim15x3.c')
-rw-r--r-- | drivers/ide/alim15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index daf9dce39e5..e56c7b72f9e 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c @@ -5,7 +5,7 @@ * * Copyright (C) 1998-2000 Andre Hedrick (andre@linux-ide.org) * May be copied or modified under the terms of the GNU General Public License - * Copyright (C) 2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002 Alan Cox * ALi (now ULi M5228) support by Clear Zhang <Clear.Zhang@ali.com.tw> * Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com> * Copyright (C) 2007 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> |