| commit | 3a4b0c948d286523ba062985c03487b55326eaae | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Wed Jan 07 14:39:02 2015 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Wed Jan 07 14:39:16 2015 +0100 |
| tree | 8c61bbeb09f9d810d3132919c22e8effcc4e545c | |
| parent | fa44b988d2da58334ecbcf3e00f9acccbdeace6c [diff] | |
| parent | 1e359a5de861a57aa04d92bb620f52a5c1d7f8b1 [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>