aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sonypi.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-05-10 07:08:37 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-10 07:08:37 -0400
commit2ecf042ef530dd0943e41d84b6344f507941af3e (patch)
tree73100361dd74e3f80f14c7c81ba4675948983f44 /include/linux/sonypi.h
parent32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff)
parentde5603748af8bf7deac403e6ba92887f8d18e812 (diff)
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/sonypi.h')
-rw-r--r--include/linux/sonypi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index f56d24734950..34d4b075f7b8 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -5,7 +5,7 @@
5 * 5 *
6 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> 6 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
7 7
8 * Copyright (C) 2001-2002 Alcve <www.alcove.com> 8 * Copyright (C) 2001-2002 Alcรดve <www.alcove.com>
9 * 9 *
10 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> 10 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
11 * 11 *