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/serial/00-INDEX | |
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/serial/00-INDEX')
-rw-r--r-- | Documentation/serial/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/serial/00-INDEX b/Documentation/serial/00-INDEX index 07dcdb0d2a36..e09468ad3cb1 100644 --- a/Documentation/serial/00-INDEX +++ b/Documentation/serial/00-INDEX | |||
@@ -14,6 +14,8 @@ riscom8.txt | |||
14 | - notes on using the RISCom/8 multi-port serial driver. | 14 | - notes on using the RISCom/8 multi-port serial driver. |
15 | rocket.txt | 15 | rocket.txt |
16 | - info on the Comtrol RocketPort multiport serial driver. | 16 | - info on the Comtrol RocketPort multiport serial driver. |
17 | serial-rs485.txt | ||
18 | - info about RS485 structures and support in the kernel. | ||
17 | specialix.txt | 19 | specialix.txt |
18 | - info on hardware/driver for specialix IO8+ multiport serial card. | 20 | - info on hardware/driver for specialix IO8+ multiport serial card. |
19 | stallion.txt | 21 | stallion.txt |