diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-24 09:29:24 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-24 09:32:53 +0200 |
| commit | b599c89e8c5cf0c37352e0871be240291f8ce922 (patch) | |
| tree | a03ce75b3a3d6d39852bc201b26bcfab412bf55f /drivers/net/wireless/cw1200/wsm.c | |
| parent | ee1452d7458451a7508e0663553ce88d63958157 (diff) | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
Merge tag 'v3.12-rc2' into drm-intel-next
Backmerge Linux 3.12-rc2 to prep for a bunch of -next patches:
- Header cleanup in intel_drv.h, both changed in -fixes and my current
-next pile.
- Cursor handling cleanup for -next which depends upon the cursor
handling fix merged into -rc2.
All just trivial conflicts of the "changed adjacent lines" type:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/net/wireless/cw1200/wsm.c')
| -rw-r--r-- | drivers/net/wireless/cw1200/wsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/wsm.c b/drivers/net/wireless/cw1200/wsm.c index cbb74d7a9be..9e0ca304865 100644 --- a/drivers/net/wireless/cw1200/wsm.c +++ b/drivers/net/wireless/cw1200/wsm.c @@ -1199,7 +1199,7 @@ bool wsm_flush_tx(struct cw1200_common *priv) if (priv->bh_error) { /* In case of failure do not wait for magic. */ - pr_err("[WSM] Fatal error occured, will not flush TX.\n"); + pr_err("[WSM] Fatal error occurred, will not flush TX.\n"); return false; } else { /* Get a timestamp of "oldest" frame */ |