e4901f486a5266fd73e4ee80205b18b4
author Johannes Berg <johannes.berg@intel.com> 1340883958 +0200
committer Johannes Berg <johannes.berg@intel.com> 1340883958 +0200

Merge remote-tracking branch 'wireless-next/master' into mac80211-next
[