diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/common/icst.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/common/icst.c')
| -rw-r--r-- | arch/arm/common/icst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/icst.c b/arch/arm/common/icst.c index 9a7f09cff300..2dc6da70ae59 100644 --- a/arch/arm/common/icst.c +++ b/arch/arm/common/icst.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | * | 9 | * |
| 10 | * Support functions for calculating clocks/divisors for the ICST307 | 10 | * Support functions for calculating clocks/divisors for the ICST307 |
| 11 | * clock generators. See http://www.icst.com/ for more information | 11 | * clock generators. See http://www.idt.com/ for more information |
| 12 | * on these devices. | 12 | * on these devices. |
| 13 | * | 13 | * |
| 14 | * This is an almost identical implementation to the ICST525 clock generator. | 14 | * This is an almost identical implementation to the ICST525 clock generator. |