| commit | 206c59d1d7d42bcafc1d7f1e476e87e4427e2345 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Wed Jun 10 12:44:58 2015 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Wed Jun 10 12:45:09 2015 +0200 |
| tree | a2f99470bd0fe43f5cf57812fca969bb3ca3c451 | |
| parent | 5ec596c41bba6f4e3eeef5dc089afc8eaa702a7e [diff] | |
| parent | c3eee1fb1d308564ada5f7ea57bc51efc6130b37 [diff] |
Merge remote-tracking branch 'net-next/master' into mac80211-next Merge back net-next to get wireless driver changes (from Kalle) to be able to create the API change across all trees properly. Signed-off-by: Johannes Berg <johannes.berg@intel.com>