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 | |
| parent | 0c31862880c4f8d4a36d3a208e76d45066aeeb88 (diff) | |
| parent | ccae941ee2de58b9391f4e166b1bad33fcbfc119 (diff) | |
ARM: Merge next-s3c24xx-simtec
Merge branch 'next-s3c24xx-simtec' into for-rmk
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt | 2 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/GPIO.txt | 2 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/S3C2412.txt | 2 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/S3C2413.txt | 2 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/Suspend.txt | 2 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/USB-Host.txt | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt b/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt index 26422f0f9080..b87292e05f2f 100644 --- a/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt +++ b/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt | |||
| @@ -55,4 +55,4 @@ Maintainers | |||
| 55 | This board is maintained by Simtec Electronics. | 55 | This board is maintained by Simtec Electronics. |
| 56 | 56 | ||
| 57 | 57 | ||
| 58 | (c) 2004 Ben Dooks, Simtec Electronics | 58 | Copyright 2004 Ben Dooks, Simtec Electronics |
diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt index 948c8718d967..2af2cf39915f 100644 --- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt +++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt | |||
| @@ -134,4 +134,4 @@ Authour | |||
| 134 | 134 | ||
| 135 | 135 | ||
| 136 | Ben Dooks, 03 October 2004 | 136 | Ben Dooks, 03 October 2004 |
| 137 | (c) 2004 Ben Dooks, Simtec Electronics | 137 | Copyright 2004 Ben Dooks, Simtec Electronics |
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 |
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 | |||
| 117 | Document Author | 117 | Document Author |
| 118 | --------------- | 118 | --------------- |
| 119 | 119 | ||
| 120 | Ben Dooks, (c) 2006 Simtec Electronics | 120 | Ben Dooks, Copyright 2006 Simtec Electronics |
diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2413.txt b/Documentation/arm/Samsung-S3C24XX/S3C2413.txt index ab2a88858f12..909bdc7dd7b5 100644 --- a/Documentation/arm/Samsung-S3C24XX/S3C2413.txt +++ b/Documentation/arm/Samsung-S3C24XX/S3C2413.txt | |||
| @@ -18,4 +18,4 @@ Camera Interface | |||
| 18 | Document Author | 18 | Document Author |
| 19 | --------------- | 19 | --------------- |
| 20 | 20 | ||
| 21 | Ben Dooks, (c) 2006 Simtec Electronics | 21 | Ben Dooks, Copyright 2006 Simtec Electronics |
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 | |||
| 133 | Document Author | 133 | Document Author |
| 134 | --------------- | 134 | --------------- |
| 135 | 135 | ||
| 136 | Ben Dooks, (c) 2004 Simtec Electronics | 136 | Ben Dooks, Copyright 2004 Simtec Electronics |
| 137 | 137 | ||
diff --git a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt index 67671eba4231..f82b1faefad5 100644 --- a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt +++ b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt | |||
| @@ -90,4 +90,4 @@ Platform Data | |||
| 90 | Document Author | 90 | Document Author |
| 91 | --------------- | 91 | --------------- |
| 92 | 92 | ||
| 93 | Ben Dooks, (c) 2005 Simtec Electronics | 93 | Ben Dooks, Copyright 2005 Simtec Electronics |