Merge branch 'master' of...
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/bcma/scan.c 6 additions, 0 deletionsdrivers/bcma/scan.c
- drivers/net/wireless/ath/ath6kl/cfg80211.c 174 additions, 34 deletionsdrivers/net/wireless/ath/ath6kl/cfg80211.c
- drivers/net/wireless/ath/ath6kl/cfg80211.h 2 additions, 0 deletionsdrivers/net/wireless/ath/ath6kl/cfg80211.h
- drivers/net/wireless/ath/ath6kl/core.h 32 additions, 6 deletionsdrivers/net/wireless/ath/ath6kl/core.h
- drivers/net/wireless/ath/ath6kl/htc_mbox.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath6kl/htc_mbox.c
- drivers/net/wireless/ath/ath6kl/init.c 25 additions, 3 deletionsdrivers/net/wireless/ath/ath6kl/init.c
- drivers/net/wireless/ath/ath6kl/main.c 17 additions, 10 deletionsdrivers/net/wireless/ath/ath6kl/main.c
- drivers/net/wireless/ath/ath6kl/target.h 1 addition, 0 deletionsdrivers/net/wireless/ath/ath6kl/target.h
- drivers/net/wireless/ath/ath6kl/txrx.c 24 additions, 24 deletionsdrivers/net/wireless/ath/ath6kl/txrx.c
- drivers/net/wireless/ath/ath6kl/wmi.c 145 additions, 3 deletionsdrivers/net/wireless/ath/ath6kl/wmi.c
- drivers/net/wireless/ath/ath6kl/wmi.h 56 additions, 2 deletionsdrivers/net/wireless/ath/ath6kl/wmi.h
- drivers/net/wireless/ath/ath9k/ani.c 64 additions, 425 deletionsdrivers/net/wireless/ath/ath9k/ani.c
- drivers/net/wireless/ath/ath9k/ani.h 10 additions, 22 deletionsdrivers/net/wireless/ath/ath9k/ani.h
- drivers/net/wireless/ath/ath9k/ar5008_phy.c 19 additions, 157 deletionsdrivers/net/wireless/ath/ath9k/ar5008_phy.c
- drivers/net/wireless/ath/ath9k/ar9002_hw.c 0 additions, 4 deletionsdrivers/net/wireless/ath/ath9k/ar9002_hw.c
- drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h 1 addition, 0 deletionsdrivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
- drivers/net/wireless/ath/ath9k/ar9003_mci.c 15 additions, 6 deletionsdrivers/net/wireless/ath/ath9k/ar9003_mci.c
- drivers/net/wireless/ath/ath9k/ar9003_phy.c 21 additions, 23 deletionsdrivers/net/wireless/ath/ath9k/ar9003_phy.c
- drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h 2 additions, 51 deletionsdrivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
Loading
Please register or sign in to comment