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 /Documentation/arm/SA1100/FreeBird | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/arm/SA1100/FreeBird')
| -rw-r--r-- | Documentation/arm/SA1100/FreeBird | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/arm/SA1100/FreeBird b/Documentation/arm/SA1100/FreeBird index fb23b770aaf4..ab9193663b2b 100644 --- a/Documentation/arm/SA1100/FreeBird +++ b/Documentation/arm/SA1100/FreeBird | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Freebird-1.1 is produced by Legned(C) ,Inc. | 1 | Freebird-1.1 is produced by Legend(C), Inc. |
| 2 | http://web.archive.org/web/*/http://www.legend.com.cn | 2 | http://web.archive.org/web/*/http://www.legend.com.cn |
| 3 | and software/linux mainatined by Coventive(C),Inc. | 3 | and software/linux maintained by Coventive(C), Inc. |
| 4 | (http://www.coventive.com) | 4 | (http://www.coventive.com) |
| 5 | 5 | ||
| 6 | Based on the Nicolas's strongarm kernel tree. | 6 | Based on the Nicolas's strongarm kernel tree. |