diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /include/net/wimax.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'include/net/wimax.h')
| -rw-r--r-- | include/net/wimax.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/wimax.h b/include/net/wimax.h index 2af7bf839f23..3b07f6aad102 100644 --- a/include/net/wimax.h +++ b/include/net/wimax.h | |||
| @@ -79,7 +79,7 @@ | |||
| 79 | * drivers have to only report state changes due to external | 79 | * drivers have to only report state changes due to external |
| 80 | * conditions. | 80 | * conditions. |
| 81 | * | 81 | * |
| 82 | * All API operations are 'atomic', serialized thorough a mutex in the | 82 | * All API operations are 'atomic', serialized through a mutex in the |
| 83 | * `struct wimax_dev`. | 83 | * `struct wimax_dev`. |
| 84 | * | 84 | * |
| 85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK | 85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK |