diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:32 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:55 +0200 |
| commit | 753d179ad001b25425beb977d00f2531540e7d42 (patch) | |
| tree | de61b9e3c86b71e9a654cea002b188f90b1f8ef6 /net/lapb/lapb_timer.c | |
| parent | cfg80211/nl80211: add a port authorized event (diff) | |
| parent | net/ipv6: remove unused err variable on icmpv6_push_pending_frames (diff) | |
| download | wireguard-linux-753d179ad001b25425beb977d00f2531540e7d42.tar.xz wireguard-linux-753d179ad001b25425beb977d00f2531540e7d42.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions