]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6281a4bf49ac6879f8a527a3ad11f0649c9c1d42
tree6cd273487574edd2da40ce14b1981e14a5171caa
parentc8cdce02c55aaaaccbe9068e7c4f7e8594d5a494
parent1b403a0e0ff84b8a8683f03898d793ef4cbf41e8
Merge branch 'for-john' of git://git.kernel.org/pub/scm/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