diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/uwb/driver.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 |