Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 6 Mar 2013 15:21:17 +0000 (10:21 -0500)]
1  2 
net/mac80211/tx.c
net/wireless/core.c

Simple merge
Simple merge