diff --git a/[refs] b/[refs] index f99a9f095737..d76d713291a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51633632ef614ef045f25d76fc7f0133d7cc60c6 +refs/heads/master: e5eb8bd9429ebd04cf906156d1fe40b52f88e82f diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c index 7e38858a9280..29e1acca207c 100644 --- a/trunk/net/mac80211/util.c +++ b/trunk/net/mac80211/util.c @@ -1094,7 +1094,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) if (res) { WARN(local->suspended, "Harware became unavailable " "upon resume. This is could be a software issue" - "prior to suspend or a harware issue\n"); + "prior to suspend or a hardware issue\n"); return res; }