Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 13 Oct 2015 08:28:16 +0000 (10:28 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 13 Oct 2015 08:28:43 +0000 (10:28 +0200)
commit985f2c87a7109a42cac93f56ea595353d53a1746
tree69fe0acbbfeb6a348d6f4c64750d278e56b935b3
parent4d57c67827d7bb79c4fcf6618bf80930808e50c6
parent6623c60dc28ee966cd85c6f12aa2fc3c952d0179
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>