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 /drivers/uwb/driver.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/uwb/driver.c')
| -rw-r--r-- | drivers/uwb/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/driver.c b/drivers/uwb/driver.c index 08bd6dbfd4a6..3e5454aba5d4 100644 --- a/drivers/uwb/driver.c +++ b/drivers/uwb/driver.c | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * If a beacon dissapears for longer than this, then we consider the | 64 | * If a beacon disappears for longer than this, then we consider the |
| 65 | * device who was represented by that beacon to be gone. | 65 | * device who was represented by that beacon to be gone. |
| 66 | * | 66 | * |
| 67 | * ECMA-368[17.2.3, last para] establishes that a device must not | 67 | * ECMA-368[17.2.3, last para] establishes that a device must not |