| commit | 8fa74e3aa6398ffef3c52147c969c0f5f0a1244e | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Mon Oct 20 16:41:33 2014 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Mon Oct 20 21:39:29 2014 +0200 |
| tree | 01b6138e17581a27d62e71a013bb85638abd9a7a | |
| parent | b08cc24e0a24f8d67ba7d66dab43c40ed25a3f5c [diff] | |
| parent | 11b2357d5dbce999803e9055f8c09829a8a87db4 [diff] |
Merge branch 'mac80211' into mac80211-next This was needed to avoid conflicts in the minstrel changes. Signed-off-by: Johannes Berg <johannes.berg@intel.com>