diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:02 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:16 +0100 |
| commit | 3a4b0c948d286523ba062985c03487b55326eaae (patch) | |
| tree | 8c61bbeb09f9d810d3132919c22e8effcc4e545c /include/uapi | |
| parent | mac80211: skip disabled channels in VHT check (diff) | |
| parent | Revert "mac80211: Fix accounting of the tailroom-needed counter" (diff) | |
Merge branch 'mac80211' into mac80211-next
Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/uapi')
0 files changed, 0 insertions, 0 deletions