Merge branch 'master' of...
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: net/wireless/nl80211.c
Showing
- Documentation/DocBook/80211.tmpl 5 additions, 6 deletionsDocumentation/DocBook/80211.tmpl
- drivers/bcma/Kconfig 1 addition, 0 deletionsdrivers/bcma/Kconfig
- drivers/bcma/core.c 25 additions, 3 deletionsdrivers/bcma/core.c
- drivers/bcma/driver_chipcommon_sflash.c 4 additions, 4 deletionsdrivers/bcma/driver_chipcommon_sflash.c
- drivers/bluetooth/btmrvl_sdio.c 1 addition, 0 deletionsdrivers/bluetooth/btmrvl_sdio.c
- drivers/bluetooth/btusb.c 3 additions, 0 deletionsdrivers/bluetooth/btusb.c
- drivers/net/wireless/ath/Kconfig 1 addition, 0 deletionsdrivers/net/wireless/ath/Kconfig
- drivers/net/wireless/ath/Makefile 1 addition, 0 deletionsdrivers/net/wireless/ath/Makefile
- drivers/net/wireless/ath/ath.h 6 additions, 7 deletionsdrivers/net/wireless/ath/ath.h
- drivers/net/wireless/ath/ath10k/Kconfig 39 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/Kconfig
- drivers/net/wireless/ath/ath10k/Makefile 20 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/Makefile
- drivers/net/wireless/ath/ath10k/bmi.c 295 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/bmi.c
- drivers/net/wireless/ath/ath10k/bmi.h 224 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/bmi.h
- drivers/net/wireless/ath/ath10k/ce.c 1189 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/ce.c
- drivers/net/wireless/ath/ath10k/ce.h 516 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/ce.h
- drivers/net/wireless/ath/ath10k/core.c 665 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/core.c
- drivers/net/wireless/ath/ath10k/core.h 369 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/core.h
- drivers/net/wireless/ath/ath10k/debug.c 503 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/debug.c
- drivers/net/wireless/ath/ath10k/debug.h 90 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/debug.h
- drivers/net/wireless/ath/ath10k/hif.h 137 additions, 0 deletionsdrivers/net/wireless/ath/ath10k/hif.h
Please register or sign in to comment