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/isdn | |
| 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/isdn')
| -rw-r--r-- | Documentation/isdn/INTERFACE.CAPI | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/isdn/INTERFACE.CAPI b/Documentation/isdn/INTERFACE.CAPI index 309eb5ed942b..1688b5a1fd77 100644 --- a/Documentation/isdn/INTERFACE.CAPI +++ b/Documentation/isdn/INTERFACE.CAPI | |||
| @@ -240,7 +240,7 @@ Functions capi_cmsg2message() and capi_message2cmsg() are provided to convert | |||
| 240 | messages between their transport encoding described in the CAPI 2.0 standard | 240 | messages between their transport encoding described in the CAPI 2.0 standard |
| 241 | and their _cmsg structure representation. Note that capi_cmsg2message() does | 241 | and their _cmsg structure representation. Note that capi_cmsg2message() does |
| 242 | not know or check the size of its destination buffer. The caller must make | 242 | not know or check the size of its destination buffer. The caller must make |
| 243 | sure it is big enough to accomodate the resulting CAPI message. | 243 | sure it is big enough to accommodate the resulting CAPI message. |
| 244 | 244 | ||
| 245 | 245 | ||
| 246 | 5. Lower Layer Interface Functions | 246 | 5. Lower Layer Interface Functions |