Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / rc80211_pid.h

diff --git a/net/mac80211/rc80211_pid.h b/net/mac80211/rc80211_pid.h
index 6510f8ee738eca7303ff77c8583e7659dbfe4040..19111c7bf454bc022eff5dfca098af465b25b8a8 100644 (file)
--- a/net/mac80211/rc80211_pid.h
+++ b/net/mac80211/rc80211_pid.h
@@ -77,7 +77,7 @@ union rc_pid_event_data {
 };
 
 struct rc_pid_event {
-       /* The time when the event occured */
+       /* The time when the event occurred */
        unsigned long timestamp;
 
        /* Event ID number */