summaryrefslogtreecommitdiffstats
path: root/Documentation/arm/Samsung-S3C24XX/Suspend.txt
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-05 11:35:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-05 11:35:33 +0100
commit0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch)
tree794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /Documentation/arm/Samsung-S3C24XX/Suspend.txt
parentMerge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' i... (diff)
parentMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff)
downloadlinux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.xz
linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'Documentation/arm/Samsung-S3C24XX/Suspend.txt')
-rw-r--r--Documentation/arm/Samsung-S3C24XX/Suspend.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/Suspend.txt b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
index a30fe510572b..7edd0e2e6c5b 100644
--- a/Documentation/arm/Samsung-S3C24XX/Suspend.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
@@ -133,5 +133,5 @@ Configuration
Document Author
---------------
-Ben Dooks, (c) 2004 Simtec Electronics
+Ben Dooks, Copyright 2004 Simtec Electronics