diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-16 16:53:59 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-16 16:53:59 +0200 |
| commit | 4cd41ffd27b6b775445ecfdb72b592b71d6b4a32 (patch) | |
| tree | 61e8c51ed5b9fae163d2d54967ebda02805c0bfa /include/net/wimax.h | |
| parent | usb: dwc3: Add Qualcomm DWC3 glue layer driver (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-4cd41ffd27b6b775445ecfdb72b592b71d6b4a32.tar.xz linux-4cd41ffd27b6b775445ecfdb72b592b71d6b4a32.zip | |
Merge tag 'v3.17-rc5' into next
Linux 3.17-rc5
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.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 e52ef5357e08..c52b68577cb0 100644 --- a/include/net/wimax.h +++ b/include/net/wimax.h @@ -290,7 +290,7 @@ struct wimax_dev; * This operation has to be synchronous, and return only when the * reset is complete. In case of having had to resort to bus/cold * reset implying a device disconnection, the call is allowed to - * return inmediately. + * return immediately. * NOTE: wimax_dev->mutex is NOT locked when this op is being * called; however, wimax_dev->mutex_reset IS locked to ensure * serialization of calls to wimax_reset(). |