diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 20:36:35 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 20:36:35 +0300 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /net/wimax | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
| download | linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'net/wimax')
| -rw-r--r-- | net/wimax/op-reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wimax/op-reset.c b/net/wimax/op-reset.c index ca269178c4d4..35f370091f4f 100644 --- a/net/wimax/op-reset.c +++ b/net/wimax/op-reset.c @@ -62,7 +62,7 @@ * Called when wanting to reset the device for any reason. Device is * taken back to power on status. * - * This call blocks; on succesful return, the device has completed the + * This call blocks; on successful return, the device has completed the * reset process and is ready to operate. */ int wimax_reset(struct wimax_dev *wimax_dev) |