Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts: drivers/net/wireless/mac80211_hwsim.c
Showing
- drivers/net/wireless/adm8211.c 3 additions, 1 deletiondrivers/net/wireless/adm8211.c
- drivers/net/wireless/at76c50x-usb.c 3 additions, 1 deletiondrivers/net/wireless/at76c50x-usb.c
- drivers/net/wireless/ath/ath5k/mac80211-ops.c 2 additions, 1 deletiondrivers/net/wireless/ath/ath5k/mac80211-ops.c
- drivers/net/wireless/ath/ath9k/ath9k.h 1 addition, 0 deletionsdrivers/net/wireless/ath/ath9k/ath9k.h
- drivers/net/wireless/ath/ath9k/htc.h 1 addition, 0 deletionsdrivers/net/wireless/ath/ath9k/htc.h
- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/htc_drv_beacon.c
- drivers/net/wireless/ath/ath9k/htc_drv_main.c 4 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/htc_drv_main.c
- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/htc_drv_txrx.c
- drivers/net/wireless/ath/ath9k/main.c 4 additions, 1 deletiondrivers/net/wireless/ath/ath9k/main.c
- drivers/net/wireless/ath/ath9k/xmit.c 5 additions, 4 deletionsdrivers/net/wireless/ath/ath9k/xmit.c
- drivers/net/wireless/ath/carl9170/carl9170.h 3 additions, 1 deletiondrivers/net/wireless/ath/carl9170/carl9170.h
- drivers/net/wireless/ath/carl9170/tx.c 8 additions, 8 deletionsdrivers/net/wireless/ath/carl9170/tx.c
- drivers/net/wireless/b43/main.c 2 additions, 1 deletiondrivers/net/wireless/b43/main.c
- drivers/net/wireless/b43legacy/main.c 1 addition, 0 deletionsdrivers/net/wireless/b43legacy/main.c
- drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 4 additions, 2 deletionsdrivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
- drivers/net/wireless/iwlegacy/3945-mac.c 8 additions, 4 deletionsdrivers/net/wireless/iwlegacy/3945-mac.c
- drivers/net/wireless/iwlegacy/4965-mac.c 15 additions, 11 deletionsdrivers/net/wireless/iwlegacy/4965-mac.c
- drivers/net/wireless/iwlegacy/4965.h 6 additions, 2 deletionsdrivers/net/wireless/iwlegacy/4965.h
- drivers/net/wireless/iwlwifi/dvm/agn.h 3 additions, 1 deletiondrivers/net/wireless/iwlwifi/dvm/agn.h
- drivers/net/wireless/iwlwifi/dvm/mac80211.c 4 additions, 2 deletionsdrivers/net/wireless/iwlwifi/dvm/mac80211.c
Loading
Please register or sign in to comment