diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 04:38:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 04:38:27 (GMT) |
| commit | 49dc2b7173010792c6923930ffcee84b7094b7de (patch) | |
| tree | 439899abc82e7413b3bee6d52823d5350d7f2245 /drivers/infiniband | |
| parent | d66435cc7da95964cb386674bd82ec12ca66320a (diff) | |
| parent | d00cd819d7dfb1a24d814457f47ff4d6c7be152c (diff) | |
| download | linux-49dc2b7173010792c6923930ffcee84b7094b7de.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
drivers/rtc: broken link fix
drm/i915 Fix typos in i915_gem_fence.c
Docs: fix missing word in REPORTING-BUGS
lib+mm: fix few spelling mistakes
MAINTAINERS: add git URL for APM driver
treewide: Fix typo in printk
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c index 5f44b66..5b0248a 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c @@ -64,7 +64,7 @@ const char *usnic_ib_qp_grp_state_to_string(enum ib_qp_state state) case IB_QPS_ERR: return "ERR"; default: - return "UNKOWN STATE"; + return "UNKNOWN STATE"; } } |