Merge remote branch 'wireless-next/master' into ath6kl-next

diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/init.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/txrx.c
index 0163182,521f0be..82f2f5c
--- 1/drivers/net/wireless/ath/ath6kl/txrx.c
--- 2/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@@ -15,9 -15,10 +15,11 @@@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
  #include "core.h"
  #include "debug.h"
 +#include "htc-ops.h"
  
  /*
   * tid - tid_mux0..tid_mux3