diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /net/mac80211/rc80211_pid.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'net/mac80211/rc80211_pid.h')
| -rw-r--r-- | net/mac80211/rc80211_pid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_pid.h b/net/mac80211/rc80211_pid.h index 6510f8ee738e..19111c7bf454 100644 --- a/net/mac80211/rc80211_pid.h +++ b/net/mac80211/rc80211_pid.h | |||
| @@ -77,7 +77,7 @@ union rc_pid_event_data { | |||
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | struct rc_pid_event { | 79 | struct rc_pid_event { |
| 80 | /* The time when the event occured */ | 80 | /* The time when the event occurred */ |
| 81 | unsigned long timestamp; | 81 | unsigned long timestamp; |
| 82 | 82 | ||
| 83 | /* Event ID number */ | 83 | /* Event ID number */ |