| commit | 72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Fri Jul 17 15:39:38 2015 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Fri Jul 17 15:39:41 2015 +0200 |
| tree | 8f014bc8663c3e0eec3250ceb46ca18674e8932a | |
| parent | 322cd406da0b102dda9c0eec46181458a3667dbb [diff] | |
| parent | 923b352f19d9ea971ae2536eab55f5fc9e95fedf [diff] |
Merge branch 'mac80211' into mac80211-next This is necessary to merge the new TDLS and mesh patches, as they depend on some fixes. Signed-off-by: Johannes Berg <johannes.berg@intel.com>