Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Mar 2014 15:53:20 +0000 (11:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Mar 2014 15:53:20 +0000 (11:53 -0400)
1  2 
include/linux/ieee80211.h
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/tx.c
net/wireless/reg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge