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)
commit7eb2450a51ea7606fa69ae4bb2113e0f228223cc
tree6cd273487574edd2da40ce14b1981e14a5171caa
parent474a41e94dfc85167e1761bfbb8bf180f90633b2
parent73fb08e24ae840bc518facc2c605dd6bb3751fec
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
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