diff options
author | Steve French <sfrench@us.ibm.com> | 2007-10-20 04:26:44 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 04:26:44 +0000 |
commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/char/sonypi.c | |
parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
download | talos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.tar.gz talos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/sonypi.c')
-rw-r--r-- | drivers/char/sonypi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 9782cb4d30dc..877e53dcb996 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -7,7 +7,7 @@ * * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> * - * Copyright (C) 2001-2002 Alcôve <www.alcove.com> + * Copyright (C) 2001-2002 Alcôve <www.alcove.com> * * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> * |