Merge remote-tracking branch 'mac80211/master' into HEAD
Johannes Berg [Wed, 6 Mar 2013 15:33:12 +0000 (16:33 +0100)]
There are a few things that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1  2 
net/mac80211/tx.c
net/wireless/core.c

Simple merge
Simple merge