Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Showing
- drivers/net/wireless/ath/ath9k/init.c 2 additions, 1 deletiondrivers/net/wireless/ath/ath9k/init.c
- drivers/net/wireless/ath/carl9170/main.c 2 additions, 1 deletiondrivers/net/wireless/ath/carl9170/main.c
- drivers/net/wireless/rt2x00/rt2800lib.c 2 additions, 1 deletiondrivers/net/wireless/rt2x00/rt2800lib.c
- include/net/mac80211.h 1 addition, 0 deletionsinclude/net/mac80211.h
- net/mac80211/ibss.c 30 additions, 4 deletionsnet/mac80211/ibss.c
- net/mac80211/rc80211_minstrel_ht.c 3 additions, 0 deletionsnet/mac80211/rc80211_minstrel_ht.c
Please register or sign in to comment