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/i2o | |
| 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/i2o')
| -rw-r--r-- | Documentation/i2o/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2o/README b/Documentation/i2o/README index 0ebf58c73f54..ee91e2626ff0 100644 --- a/Documentation/i2o/README +++ b/Documentation/i2o/README | |||
| @@ -53,7 +53,7 @@ Symbios Logic (Now LSI) | |||
| 53 | BoxHill Corporation | 53 | BoxHill Corporation |
| 54 | Loan of initial FibreChannel disk array used for development work. | 54 | Loan of initial FibreChannel disk array used for development work. |
| 55 | 55 | ||
| 56 | European Comission | 56 | European Commission |
| 57 | Funding the work done by the University of Helsinki | 57 | Funding the work done by the University of Helsinki |
| 58 | 58 | ||
| 59 | SysKonnect | 59 | SysKonnect |