Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
No related branches found
No related tags found
Showing
- drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
- drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c 2 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
- drivers/net/wireless/ath/ath9k/dfs_pri_detector.c 2 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/dfs_pri_detector.c
- drivers/net/wireless/ath/ath9k/htc_drv_init.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/htc_drv_init.c
- drivers/net/wireless/b43/phy_n.c 2 additions, 1 deletiondrivers/net/wireless/b43/phy_n.c
- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 1 addition, 6 deletionsdrivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
- drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 132 additions, 133 deletionsdrivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
- drivers/ssb/driver_chipcommon_pmu.c 29 additions, 0 deletionsdrivers/ssb/driver_chipcommon_pmu.c
- include/linux/ssb/ssb_driver_chipcommon.h 2 additions, 0 deletionsinclude/linux/ssb/ssb_driver_chipcommon.h
- net/mac80211/iface.c 19 additions, 8 deletionsnet/mac80211/iface.c
- net/mac80211/mlme.c 20 additions, 4 deletionsnet/mac80211/mlme.c
Loading
Please register or sign in to comment