Merge remote-tracking branch 'mac80211-next/master' into next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 25 Oct 2015 10:38:20 +0000 (12:38 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 25 Oct 2015 10:38:20 +0000 (12:38 +0200)

Trivial merge