| commit | 760a52e80fdf018a9f83a499427923e18e3bd582 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Tue Nov 18 09:32:36 2014 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Tue Nov 18 09:32:44 2014 +0100 |
| tree | b37743abb28d9109ce6278b8a896712e713bb25a | |
| parent | 0395442ad25853f50d515f4dc00e3475b0df920d [diff] | |
| parent | 47b6308b643302e642ca2a5cb6470926f7e1c428 [diff] |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next This brings in some mwifiex changes that further patches will need to work on top to not cause merge conflicts. Signed-off-by: Johannes Berg <johannes.berg@intel.com>