| commit | 985f2c87a7109a42cac93f56ea595353d53a1746 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Tue Oct 13 10:28:16 2015 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Tue Oct 13 10:28:43 2015 +0200 |
| tree | 69fe0acbbfeb6a348d6f4c64750d278e56b935b3 | |
| parent | 4d57c67827d7bb79c4fcf6618bf80930808e50c6 [diff] | |
| parent | 6623c60dc28ee966cd85c6f12aa2fc3c952d0179 [diff] |
Merge remote-tracking branch 'net-next/master' into mac80211-next Merge net-next to get some driver changes that patches depend on (in order to avoid conflicts). Signed-off-by: Johannes Berg <johannes.berg@intel.com>