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)
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>

Trivial merge