| commit | dd8070bff204a67fcb6585f18047841a895b68d7 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Wed May 23 11:05:26 2018 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Wed May 23 11:05:59 2018 +0200 |
| tree | cce17d4b8eb8987194beb40498c8f83e74d6799f | |
| parent | f3a7ca64587f58686d4e2e894e9abbfbc9dffb25 [diff] | |
| parent | 1fe8c06c4a0d3b589f076cd00c25082840f10423 [diff] |
Merge remote-tracking branch 'net-next/master' into mac80211-next Bring in net-next which had pulled in net, so I have the changes from mac80211 and can apply a patch that would otherwise conflict. Signed-off-by: Johannes Berg <johannes.berg@intel.com>