diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 11:35:33 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 11:35:33 +0100 |
commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /Documentation/arm/Samsung-S3C24XX/S3C2412.txt | |
parent | Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' i... (diff) | |
parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
download | linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.xz linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.zip |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'Documentation/arm/Samsung-S3C24XX/S3C2412.txt')
-rw-r--r-- | Documentation/arm/Samsung-S3C24XX/S3C2412.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt index 295d971a15ed..f057876b920b 100644 --- a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt +++ b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt @@ -117,4 +117,4 @@ ATA Document Author --------------- -Ben Dooks, (c) 2006 Simtec Electronics +Ben Dooks, Copyright 2006 Simtec Electronics |