diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 16:31:20 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 16:31:20 -0500 |
| commit | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (patch) | |
| tree | 7372a6f8ed5f4adb8c6829447aaea2872d0e61f6 /Documentation/arm/Samsung-S3C24XX/Overview.txt | |
| parent | 0c31862880c4f8d4a36d3a208e76d45066aeeb88 (diff) | |
| parent | ccae941ee2de58b9391f4e166b1bad33fcbfc119 (diff) | |
ARM: Merge next-s3c24xx-simtec
Merge branch 'next-s3c24xx-simtec' into for-rmk
Diffstat (limited to 'Documentation/arm/Samsung-S3C24XX/Overview.txt')
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt index cff6227b4484..081892df4fda 100644 --- a/Documentation/arm/Samsung-S3C24XX/Overview.txt +++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt | |||
| @@ -299,4 +299,4 @@ Port Contributors | |||
| 299 | Document Author | 299 | Document Author |
| 300 | --------------- | 300 | --------------- |
| 301 | 301 | ||
| 302 | Ben Dooks, (c) 2004-2005,2006 Simtec Electronics | 302 | Ben Dooks, Copyright 2004-2006 Simtec Electronics |