| commit | 944b9e375d89271c39995d363f62cb91734fae5f | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Thu Sep 06 15:55:50 2012 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Thu Sep 06 15:56:02 2012 +0200 |
| tree | bd6014bd0be251cdf2b32b12ca8a62e55742c0ee | |
| parent | a4ed53466a289a4139405bf7190c78a8e9d8debf [diff] | |
| parent | 7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c [diff] |
Merge remote-tracking branch 'mac80211/master' into mac80211-next Pull in mac80211.git to let the next patch apply without conflicts, also resolving a hwsim conflict. Conflicts: drivers/net/wireless/mac80211_hwsim.c Signed-off-by: Johannes Berg <johannes.berg@intel.com>