diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2017-06-08 14:14:40 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-06-08 14:14:45 +0200 |
| commit | a43e61842ec55baa486d60eed2a19af67ba78b9f (patch) | |
| tree | 6c3c93f19e3933273b73b9edd16edc146ab18527 /net/rfkill | |
| parent | mac80211: Invoke TX LED in more code paths (diff) | |
| parent | Merge branch 'mlx4-drivers-version-update' (diff) | |
| download | wireguard-linux-a43e61842ec55baa486d60eed2a19af67ba78b9f.tar.xz wireguard-linux-a43e61842ec55baa486d60eed2a19af67ba78b9f.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
This brings in commit 7a7c0a6438b8 ("mac80211: fix TX aggregation
start/stop callback race") to allow the follow-up cleanup.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/rfkill')
0 files changed, 0 insertions, 0 deletions