diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:33:54 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:33:54 +0000 |
commit | 602fd7c36728a04e61a442c9755e7d454501266c (patch) | |
tree | 6be77464bd07934a40959d68e5d08d75829bdc49 /Documentation/arm/Samsung-S3C24XX/USB-Host.txt | |
parent | d7931d9f7ab9de9158c6905caae979999134ad4d (diff) | |
parent | 88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff) |
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'Documentation/arm/Samsung-S3C24XX/USB-Host.txt')
-rw-r--r-- | Documentation/arm/Samsung-S3C24XX/USB-Host.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt index 67671eba423..f82b1faefad 100644 --- a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt +++ b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt @@ -90,4 +90,4 @@ Platform Data Document Author --------------- -Ben Dooks, (c) 2005 Simtec Electronics +Ben Dooks, Copyright 2005 Simtec Electronics |