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/DocBook/regulator.tmpl | |
| 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/DocBook/regulator.tmpl')
| -rw-r--r-- | Documentation/DocBook/regulator.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/regulator.tmpl b/Documentation/DocBook/regulator.tmpl index 53f4f8d3b810..346e552fa2cc 100644 --- a/Documentation/DocBook/regulator.tmpl +++ b/Documentation/DocBook/regulator.tmpl | |||
| @@ -267,8 +267,8 @@ | |||
| 267 | <sect1 id="machine-constraint"> | 267 | <sect1 id="machine-constraint"> |
| 268 | <title>Constraints</title> | 268 | <title>Constraints</title> |
| 269 | <para> | 269 | <para> |
| 270 | As well as definining the connections the machine interface | 270 | As well as defining the connections the machine interface |
| 271 | also provides constraints definining the operations that | 271 | also provides constraints defining the operations that |
| 272 | clients are allowed to perform and the parameters that may be | 272 | clients are allowed to perform and the parameters that may be |
| 273 | set. This is required since generally regulator devices will | 273 | set. This is required since generally regulator devices will |
| 274 | offer more flexibility than it is safe to use on a given | 274 | offer more flexibility than it is safe to use on a given |