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/tty.txt | |
| 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/tty.txt')
| -rw-r--r-- | Documentation/serial/tty.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.txt index 7c900507279f..540db41dfd5d 100644 --- a/Documentation/serial/tty.txt +++ b/Documentation/serial/tty.txt | |||
| @@ -107,7 +107,7 @@ write_wakeup() - May be called at any point between open and close. | |||
| 107 | 107 | ||
| 108 | dcd_change() - Report to the tty line the current DCD pin status | 108 | dcd_change() - Report to the tty line the current DCD pin status |
| 109 | changes and the relative timestamp. The timestamp | 109 | changes and the relative timestamp. The timestamp |
| 110 | can be NULL. | 110 | cannot be NULL. |
| 111 | 111 | ||
| 112 | 112 | ||
| 113 | Driver Access | 113 | Driver Access |